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

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit aa0a69a7561238778505dc740a6af54fc17352ed
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 13:48:08 2010 +0000

            Reviewed by Xan Lopez.
    
            [GTK] couple fixes for signal emissions, and property notifications
            https://bugs.webkit.org/show_bug.cgi?id=33428
    
            Fix commitedLoad being called where it should not, causing it to
            be called one time too many in some cases. We now match Qt's and
            Mac's behavior here.
    
            * WebCoreSupport/FrameLoaderClientGtk.cpp:
            (WebKit::FrameLoaderClient::finishedLoading):
            * tests/testloading.c:
            (load_error_status_changed_cb):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53138 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 6d446a3..5394fb0 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-12  Gustavo Noronha Silva  <gns at gnome.org>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] couple fixes for signal emissions, and property notifications
+        https://bugs.webkit.org/show_bug.cgi?id=33428
+
+        Fix commitedLoad being called where it should not, causing it to
+        be called one time too many in some cases. We now match Qt's and
+        Mac's behavior here.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::finishedLoading):
+        * tests/testloading.c:
+        (load_error_status_changed_cb):
+
 2010-01-08  Gustavo Noronha Silva  <gns at gnome.org>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index a690d80..4d53501 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -840,9 +840,10 @@ String FrameLoaderClient::generatedMIMETypeForURLScheme(const String&) const
 
 void FrameLoaderClient::finishedLoading(WebCore::DocumentLoader* documentLoader)
 {
-    if (!m_pluginView)
-        committedLoad(documentLoader, 0, 0);
-    else {
+    if (!m_pluginView) {
+        FrameLoader* loader = documentLoader->frameLoader();
+        loader->setEncoding(m_response.textEncodingName(), false);
+    } else {
         m_pluginView->didFinishLoading();
         m_pluginView = 0;
         m_hasSentResponseToPlugin = false;
diff --git a/WebKit/gtk/tests/testloading.c b/WebKit/gtk/tests/testloading.c
index 34897bb..cb800c3 100644
--- a/WebKit/gtk/tests/testloading.c
+++ b/WebKit/gtk/tests/testloading.c
@@ -175,6 +175,10 @@ static void load_error_status_changed_cb(GObject* object, GParamSpec* pspec, Web
          * anything */
         fixture->has_been_provisional = TRUE;
         break;
+    case WEBKIT_LOAD_COMMITTED:
+        g_assert(!fixture->has_been_committed);
+        fixture->has_been_committed = TRUE;
+        break;
     case WEBKIT_LOAD_FINISHED:
         g_assert(fixture->has_been_provisional);
         g_assert(fixture->has_been_load_error);

-- 
WebKit Debian packaging