[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[robert at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 4a5b5869aa9a0cec3abf200a749ff9e9be151a5b
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 21:45:10 2011 +0000

    2011-01-27  Robert Hogan  <robert at webkit.org>
    
            Rubber-stamped by Andreas Kling.
    
            [Qt] Style Fix: correct indentation in FrameLoadeClientQt:createPlugin
    
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::createPlugin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76834 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index b3f2b28..74c1713 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-27  Robert Hogan  <robert at webkit.org>
+
+        Rubber-stamped by Andreas Kling.
+
+        [Qt] Style Fix: correct indentation in FrameLoadeClientQt:createPlugin
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createPlugin):
+
 2011-01-24  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Eric Seidel.
diff --git a/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 2078aa7..f09df81 100644
--- a/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -1516,46 +1516,46 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize,
 #endif // QT_NO_STYLE_STYLESHEET
     }
 
-        if (!object) {
-            QWebPluginFactory* factory = m_webFrame->page()->pluginFactory();
-            if (factory)
-                object = factory->create(mimeType, qurl, params, values);
-        }
+    if (!object) {
+        QWebPluginFactory* factory = m_webFrame->page()->pluginFactory();
+        if (factory)
+            object = factory->create(mimeType, qurl, params, values);
+    }
 
-        if (object) {
-            QWidget* widget = qobject_cast<QWidget*>(object);
-            if (widget) {
-                QWidget* parentWidget = 0;
-                if (m_webFrame->page()->d->client)
-                    parentWidget = qobject_cast<QWidget*>(m_webFrame->page()->d->client->pluginParent());
-                if (parentWidget) // don't reparent to nothing (i.e. keep whatever parent QWebPage::createPlugin() chose.
-                    widget->setParent(parentWidget);
-                widget->hide();
-                RefPtr<QtPluginWidget> w = adoptRef(new QtPluginWidget());
-                w->setPlatformWidget(widget);
-                // Make sure it's invisible until properly placed into the layout
-                w->setFrameRect(IntRect(0, 0, 0, 0));
-                return w;
-            }
+    if (object) {
+        QWidget* widget = qobject_cast<QWidget*>(object);
+        if (widget) {
+            QWidget* parentWidget = 0;
+            if (m_webFrame->page()->d->client)
+                parentWidget = qobject_cast<QWidget*>(m_webFrame->page()->d->client->pluginParent());
+            if (parentWidget) // don't reparent to nothing (i.e. keep whatever parent QWebPage::createPlugin() chose.
+                widget->setParent(parentWidget);
+            widget->hide();
+            RefPtr<QtPluginWidget> w = adoptRef(new QtPluginWidget());
+            w->setPlatformWidget(widget);
+            // Make sure it's invisible until properly placed into the layout
+            w->setFrameRect(IntRect(0, 0, 0, 0));
+            return w;
+        }
 
 #if !defined(QT_NO_GRAPHICSVIEW)
-            QGraphicsWidget* graphicsWidget = qobject_cast<QGraphicsWidget*>(object);
-            if (graphicsWidget) {
-                QGraphicsObject* parentWidget = 0;
-                if (m_webFrame->page()->d->client)
-                    parentWidget = qobject_cast<QGraphicsObject*>(m_webFrame->page()->d->client->pluginParent());
-                graphicsWidget->hide();
-                if (parentWidget) // don't reparent to nothing (i.e. keep whatever parent QWebPage::createPlugin() chose.
-                    graphicsWidget->setParentItem(parentWidget);
-                RefPtr<QtPluginGraphicsWidget> w = QtPluginGraphicsWidget::create(graphicsWidget);
-                // Make sure it's invisible until properly placed into the layout
-                w->setFrameRect(IntRect(0, 0, 0, 0));
-                return w;
-            }
+        QGraphicsWidget* graphicsWidget = qobject_cast<QGraphicsWidget*>(object);
+        if (graphicsWidget) {
+            QGraphicsObject* parentWidget = 0;
+            if (m_webFrame->page()->d->client)
+                parentWidget = qobject_cast<QGraphicsObject*>(m_webFrame->page()->d->client->pluginParent());
+            graphicsWidget->hide();
+            if (parentWidget) // don't reparent to nothing (i.e. keep whatever parent QWebPage::createPlugin() chose.
+                graphicsWidget->setParentItem(parentWidget);
+            RefPtr<QtPluginGraphicsWidget> w = QtPluginGraphicsWidget::create(graphicsWidget);
+            // Make sure it's invisible until properly placed into the layout
+            w->setFrameRect(IntRect(0, 0, 0, 0));
+            return w;
+        }
 #endif // QT_NO_GRAPHICSVIEW
 
-            // FIXME: make things work for widgetless plugins as well
-            delete object;
+        // FIXME: make things work for widgetless plugins as well
+        delete object;
     }
 #if ENABLE(NETSCAPE_PLUGIN_API)
     else { // NPAPI Plugins

-- 
WebKit Debian packaging