[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[xan at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 9e0a45fc1b19996fbc85a098f9f8a1d1a95d9783
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 12:58:05 2009 +0000

    2009-12-20  Xan Lopez  <xlopez at igalia.com>
    
            Revert the previous patch, it introduces some failures in the
            bots.
    
            * WebCoreSupport/FrameLoaderClientGtk.cpp:
            (WebKit::FrameLoaderClient::committedLoad):
            (WebKit::FrameLoaderClient::transitionToCommittedForNewPage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52416 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 887a763..6356da9 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,5 +1,14 @@
 2009-12-20  Xan Lopez  <xlopez at igalia.com>
 
+        Revert the previous patch, it introduces some failures in the
+        bots.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::committedLoad):
+        (WebKit::FrameLoaderClient::transitionToCommittedForNewPage):
+
+2009-12-20  Xan Lopez  <xlopez at igalia.com>
+
         Reviewed by Gustavo Noronha.
 
         [GTK] crash when loading new page
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index d3c1c17..a2e3ca7 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -137,6 +137,25 @@ void FrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction policyFunctio
 
 void FrameLoaderClient::committedLoad(WebCore::DocumentLoader* loader, const char* data, int length)
 {
+    if (!m_pluginView) {
+        ASSERT(loader->frame());
+        // Setting the encoding on the frame loader is our way to get work done that is normally done
+        // when the first bit of data is received, even for the case of a document with no data (like about:blank).
+        String encoding = loader->overrideEncoding();
+        bool userChosen = !encoding.isNull();
+        if (!userChosen)
+            encoding = loader->response().textEncodingName();
+
+        FrameLoader* frameLoader = loader->frameLoader();
+        frameLoader->setEncoding(encoding, userChosen);
+        if (data)
+            frameLoader->addData(data, length);
+
+        Frame* coreFrame = loader->frame();
+        if (coreFrame && coreFrame->document() && coreFrame->document()->isMediaDocument())
+            loader->cancelMainResourceLoad(frameLoader->client()->pluginWillHandleLoadError(loader->response()));
+    }
+
     if (m_pluginView) {
         if (!m_hasSentResponseToPlugin) {
             m_pluginView->didReceiveResponse(loader->response());
@@ -146,42 +165,11 @@ void FrameLoaderClient::committedLoad(WebCore::DocumentLoader* loader, const cha
         // FIXME: We may want to investigate refactoring our plugin loading
         // code to be similar to mac's.
         // Also, see http://trac.webkit.org/changeset/24118.
-        if (m_pluginView)
-            m_pluginView->didReceiveData(data, length);
-
-        return;
-    }
-
-    ASSERT(loader->frame());
-    // Setting the encoding on the frame loader is our way to get work done that is normally done
-    // when the first bit of data is received, even for the case of a document with no data (like about:blank).
-    String encoding = loader->overrideEncoding();
-    bool userChosen = !encoding.isNull();
-    if (!userChosen)
-        encoding = loader->response().textEncodingName();
-
-    FrameLoader* frameLoader = loader->frameLoader();
-    frameLoader->setEncoding(encoding, userChosen);
-    if (data)
-        frameLoader->addData(data, length);
-
-    Frame* coreFrame = loader->frame();
-    if (!coreFrame || !coreFrame->document())
-        return;
+        if (!m_pluginView)
+            return;
 
-    if (coreFrame->document()->isMediaDocument()) {
-        loader->cancelMainResourceLoad(frameLoader->client()->pluginWillHandleLoadError(loader->response()));
-        return;
+        m_pluginView->didReceiveData(data, length);
     }
-
-    // We need to wait until the document is attached (a side
-    // effect of calling setEncoding previously) to set our gtk
-    // adjustments, since that process syncs the FrameView
-    // attached to the Document's content renderer with the new
-    // FrameView set after the new page is committed
-    WebKitWebView* containingWindow = getViewFromFrame(m_frame);
-    WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(containingWindow);
-    coreFrame->view()->setGtkAdjustments(priv->horizontalAdjustment, priv->verticalAdjustment);
 }
 
 bool
@@ -1124,6 +1112,7 @@ void FrameLoaderClient::transitionToCommittedForNewPage()
         return;
 
     WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(containingWindow);
+    frame->view()->setGtkAdjustments(priv->horizontalAdjustment, priv->verticalAdjustment);
 
     if (priv->currentMenu) {
         GtkMenu* menu = priv->currentMenu;

-- 
WebKit Debian packaging