2011-02-03 Joone Hur <joone.hur@collabora.co.uk>

        Reviewed by Martin Robinson.

        [Gtk] No need to set text encoding in the provisional phase
        https://bugs.webkit.org/show_bug.cgi?id=53487

        According to changeset 67253, setEncoding could be called multiple times from
        committedLoad, finishedLoading, dispatchDidFailLoading, and setMainDocumentError
        in FrameLoaderClient. To fix this, the relevant code was removed from
        FrameLoaderClient and moved to DocumentLoader::commitData. However, that
        code was not removed from FrameLoaderClient::finishedLoading in WebKitGtk+.

        Due to this reason, after loading a html document, other ports initialize the
        text encoding from FrameLoaderClient::finishedLoading, but WebKitGtk+ sets
        the same encoding again, even tries to set encoding in the provisional phase.
        This causes unnecessary encoding setting.

        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::FrameLoaderClient): Set m_hasRepresentation to false.
        (WebKit::FrameLoaderClient::makeRepresentation): Set m_hasRepresentation to true.
        (WebKit::FrameLoaderClient::revertToProvisionalState): Set m_hasRepresentation to true.
        (WebKit::FrameLoaderClient::finishedLoading): Skip the encoding setting when
        m_hasRepresentation is false.
        * WebCoreSupport/FrameLoaderClientGtk.h: Added m_hasRepresentation.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77596 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index 4f46ae63ab00040f54d98a27ea8ddbaf6994d78a..b3fc0a9aa4b5adbab9cacd58d007c141242c4955 100644 (file)
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,29 @@
+2011-02-03  Joone Hur  <joone.hur@collabora.co.uk>
+
+        Reviewed by Martin Robinson.
+
+        [Gtk] No need to set text encoding in the provisional phase
+        https://bugs.webkit.org/show_bug.cgi?id=53487
+
+        According to changeset 67253, setEncoding could be called multiple times from 
+        committedLoad, finishedLoading, dispatchDidFailLoading, and setMainDocumentError 
+        in FrameLoaderClient. To fix this, the relevant code was removed from 
+        FrameLoaderClient and moved to DocumentLoader::commitData. However, that 
+        code was not removed from FrameLoaderClient::finishedLoading in WebKitGtk+.
+
+        Due to this reason, after loading a html document, other ports initialize the 
+        text encoding from FrameLoaderClient::finishedLoading, but WebKitGtk+ sets 
+        the same encoding again, even tries to set encoding in the provisional phase. 
+        This causes unnecessary encoding setting.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::FrameLoaderClient): Set m_hasRepresentation to false.
+        (WebKit::FrameLoaderClient::makeRepresentation): Set m_hasRepresentation to true.
+        (WebKit::FrameLoaderClient::revertToProvisionalState): Set m_hasRepresentation to true.
+        (WebKit::FrameLoaderClient::finishedLoading): Skip the encoding setting when 
+        m_hasRepresentation is false.
+        * WebCoreSupport/FrameLoaderClientGtk.h: Added m_hasRepresentation.
+
 2011-02-02  Alejandro G. Castro  <alex@igalia.com>
 
         Reviewed by Martin Robinson.

diff --git a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index 01dfb8e50dcf3cd88bf3bfa6385ef2fca5517481..4ceb6bba82c1db75144e4c3aaf22752cfa6b05d9 100644 (file)
--- a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -97,6 +97,7 @@ FrameLoaderClient::FrameLoaderClient(WebKitWebFrame* frame)
     , m_policyDecision(0)
     , m_loadingErrorPage(false)
     , m_pluginView(0)
+    , m_hasRepresentation(false)
     , m_hasSentResponseToPlugin(false)
 {
     ASSERT(m_frame);
@@ -780,7 +781,7 @@ void FrameLoaderClient::didRunInsecureContent(SecurityOrigin*)
 
 void FrameLoaderClient::makeRepresentation(WebCore::DocumentLoader*)
 {
-    notImplemented();
+    m_hasRepresentation = true;
 }
 
 void FrameLoaderClient::forceLayout()
@@ -980,7 +981,7 @@ void FrameLoaderClient::dispatchDidLoadMainResource(WebCore::DocumentLoader*)
 
 void FrameLoaderClient::revertToProvisionalState(WebCore::DocumentLoader*)
 {
-    notImplemented();
+    m_hasRepresentation = true;
 }
 
 void FrameLoaderClient::willChangeTitle(WebCore::DocumentLoader*)
@@ -1028,8 +1029,10 @@ String FrameLoaderClient::generatedMIMETypeForURLScheme(const String&) const
 void FrameLoaderClient::finishedLoading(WebCore::DocumentLoader* documentLoader)
 {
     if (!m_pluginView) {
-        FrameLoader* loader = documentLoader->frameLoader();
-        loader->writer()->setEncoding(m_response.textEncodingName(), false);
+        // This is necessary to create an empty document,
+        // but it has to be skipped in the provisional phase.
+        if (m_hasRepresentation)
+            documentLoader->frameLoader()->writer()->setEncoding("", false);
     } else {
         m_pluginView->didFinishLoading();
         m_pluginView = 0;

diff --git a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
index d8d3684221d1f881c202c48b7bda98590a52c63f..8a0736da403f9e424fd2ceb7f18dcc4936878035 100644 (file)
--- a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
+++ b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
@@ -201,6 +201,8 @@ namespace WebKit {
         // Plugin view to redirect data to
         WebCore::PluginView* m_pluginView;
         bool m_hasSentResponseToPlugin;
+
+        bool m_hasRepresentation;
     };
 
 }