[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0d2d40745ab40ec1d03cd0042174fd8adcae39a4
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 02:28:20 2010 +0000

    2010-09-10  Adam Barth  <abarth at webkit.org>
    
            Attempt to fix the failign Qt tests.  This patch adapts code from
            Chromium.  The long-term fix is to remove the need for this code, but
            that's a bit too complicated for a buildfix patch.
    
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::FrameLoaderClientQt):
            (WebCore::FrameLoaderClientQt::makeRepresentation):
            (WebCore::FrameLoaderClientQt::revertToProvisionalState):
            (WebCore::FrameLoaderClientQt::finishedLoading):
            * WebCoreSupport/FrameLoaderClientQt.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67268 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7cc80f6..ec3b6b2 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,18 @@
 2010-09-10  Adam Barth  <abarth at webkit.org>
 
+        Attempt to fix the failign Qt tests.  This patch adapts code from
+        Chromium.  The long-term fix is to remove the need for this code, but
+        that's a bit too complicated for a buildfix patch.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::FrameLoaderClientQt):
+        (WebCore::FrameLoaderClientQt::makeRepresentation):
+        (WebCore::FrameLoaderClientQt::revertToProvisionalState):
+        (WebCore::FrameLoaderClientQt::finishedLoading):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+
+2010-09-10  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Darin Fisher.
 
         Move code from WebKit-layer to DocumentLoader
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 1628634..fb8107f 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -191,7 +191,8 @@ FrameLoaderClientQt::FrameLoaderClientQt()
     , m_webFrame(0)
     , m_pluginView(0)
     , m_hasSentResponseToPlugin(false)
-    , m_loadError (ResourceError())
+    , m_hasRepresentation(false)
+    , m_loadError(ResourceError())
 {
 }
 
@@ -276,7 +277,7 @@ void FrameLoaderClientQt::transitionToCommittedForNewPage()
 
 void FrameLoaderClientQt::makeRepresentation(DocumentLoader*)
 {
-    // don't need this for now I think.
+    m_hasRepresentation = true;
 }
 
 
@@ -517,7 +518,7 @@ void FrameLoaderClientQt::dispatchDidLoadMainResource(DocumentLoader*)
 
 void FrameLoaderClientQt::revertToProvisionalState(DocumentLoader*)
 {
-    notImplemented();
+    m_hasRepresentation = true;
 }
 
 
@@ -580,8 +581,14 @@ void FrameLoaderClientQt::didChangeTitle(DocumentLoader*)
 
 void FrameLoaderClientQt::finishedLoading(DocumentLoader* loader)
 {
-    if (!m_pluginView)
+    if (!m_pluginView) {
+        // This is necessary to create an empty document. See bug 634004.
+        // However, we only want to do this if makeRepresentation has been called, to
+        // match the behavior on the Mac.
+        if (m_hasRepresentation)
+            loader->frameLoader()->writer()->setEncoding("", false);
         return;
+    }
     if (m_pluginView->isPluginView())
         m_pluginView->didFinishLoading();
     m_pluginView = 0;
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
index 86c57af..c082f91 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
@@ -237,6 +237,11 @@ private:
     WebCore::PluginView* m_pluginView;
     bool m_hasSentResponseToPlugin;
 
+    // True if makeRepresentation was called.  We don't actually have a concept
+    // of a "representation", but we need to know when we're expected to have one.
+    // See finishedLoading().
+    bool m_hasRepresentation;
+
     ResourceError m_loadError;
 };
 

-- 
WebKit Debian packaging