Changeset 53294 in webkit

Timestamp:

Jan 14, 2010 3:08:46 PM (14 years ago)

Author:

kov@webkit.org

Message:

Reviewed by Oliver Hunter.

[GTK] couple fixes for signal emissions, and property notifications
​https://bugs.webkit.org/show_bug.cgi?id=33428

Do not emit signals and property notifications for error
pages. The notifications are not really useful for anything, you
can get them back by overriding the error pages, and it avoids a
number of hacks.

• WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::FrameLoaderClient): (WebKit::FrameLoaderClient::dispatchDidFinishLoad): (WebKit::FrameLoaderClient::dispatchDidReceiveIcon): (WebKit::FrameLoaderClient::dispatchDidStartProvisionalLoad): (WebKit::FrameLoaderClient::dispatchDidReceiveTitle): (WebKit::FrameLoaderClient::dispatchDidCommitLoad): (WebKit::FrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout): (WebKit::FrameLoaderClient::dispatchDidFailLoad):
• WebCoreSupport/FrameLoaderClientGtk.h:
• tests/testloading.c: (load_error_status_changed_cb): (test_loading_error):

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (2 diffs)
• WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (9 diffs)
• WebCoreSupport/FrameLoaderClientGtk.h (modified) (1 diff)
• tests/testloading.c (modified) (3 diffs)
• webkit/webkitwebview.cpp (modified) (1 diff)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-01-14  Gustavo Noronha Silva  <gns@gnome.org>
+
+        Reviewed by Oliver Hunter.
+
+        [GTK] couple fixes for signal emissions, and property notifications
+        https://bugs.webkit.org/show_bug.cgi?id=33428
+
+        Do not emit signals and property notifications for error
+        pages. The notifications are not really useful for anything, you
+        can get them back by overriding the error pages, and it avoids a
+        number of hacks.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::FrameLoaderClient):
+        (WebKit::FrameLoaderClient::dispatchDidFinishLoad):
+        (WebKit::FrameLoaderClient::dispatchDidReceiveIcon):
+        (WebKit::FrameLoaderClient::dispatchDidStartProvisionalLoad):
+        (WebKit::FrameLoaderClient::dispatchDidReceiveTitle):
+        (WebKit::FrameLoaderClient::dispatchDidCommitLoad):
+        (WebKit::FrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout):
+        (WebKit::FrameLoaderClient::dispatchDidFailLoad):
+        * WebCoreSupport/FrameLoaderClientGtk.h:
+        * tests/testloading.c:
+        (load_error_status_changed_cb):
+        (test_loading_error):
+
 2010-01-14  Martin Robinson  <martin.james.robinson@gmail.com>
 
@@ -38 +64 @@
         (webkit_web_view_query_tooltip): Added
 
-2010-01-12  Gustavo Noronha Silva  <gns@gnome.org>
+2010-01-09  Gustavo Noronha Silva  <gns@gnome.org>
 
         Reviewed by Xan Lopez.

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -78 +78 @@
     : m_frame(frame)
     , m_policyDecision(0)
+    , m_loadingErrorPage(false)
     , m_pluginView(0)
     , m_hasSentResponseToPlugin(false)
@@ -569 +570 @@
 void FrameLoaderClient::dispatchDidFinishLoad()
 {
+    if (m_loadingErrorPage) {
+        m_loadingErrorPage = false;
+        return;
+    }
+
     loadDone(m_frame, true);
 }
@@ -704 +710 @@
 void FrameLoaderClient::dispatchDidReceiveIcon()
 {
+    if (m_loadingErrorPage)
+        return;
+
     WebKitWebView* webView = getViewFromFrame(m_frame);
 
@@ -716 +725 @@
 void FrameLoaderClient::dispatchDidStartProvisionalLoad()
 {
+    if (m_loadingErrorPage)
+        return;
+
     notifyStatus(m_frame, WEBKIT_LOAD_PROVISIONAL);
 }
@@ -721 +733 @@
 void FrameLoaderClient::dispatchDidReceiveTitle(const String& title)
 {
+    if (m_loadingErrorPage)
+        return;
+
     WebKitWebFramePrivate* priv = m_frame->priv;
     g_free(priv->title);
@@ -737 +752 @@
 void FrameLoaderClient::dispatchDidCommitLoad()
 {
+    if (m_loadingErrorPage)
+        return;
+
     /* Update the URI once first data has been received.
      * This means the URI is valid and successfully identify the page that's going to be loaded.
@@ -777 +795 @@
 void FrameLoaderClient::dispatchDidFirstVisuallyNonEmptyLayout()
 {
+    if (m_loadingErrorPage)
+        return;
+
     notifyStatus(m_frame, WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT);
 }
@@ -938 +959 @@
 void FrameLoaderClient::dispatchDidFailLoad(const ResourceError& error)
 {
+    if (m_loadingErrorPage)
+        return;
+
     notifyStatus(m_frame, WEBKIT_LOAD_FAILED);
 
@@ -956 +980 @@
         return;
     }
+
+    m_loadingErrorPage = true;
 
     String content;

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h

@@ -185 +185 @@
         WebKitWebPolicyDecision* m_policyDecision;
 
+        bool m_loadingErrorPage;
+
         // Plugin view to redirect data to
         WebCore::PluginView* m_pluginView;

trunk/WebKit/gtk/tests/testloading.c

@@ -172 +172 @@
     switch(status) {
     case WEBKIT_LOAD_PROVISIONAL:
-        /* We are going to go through here twice, so don't assert
-         * anything */
+        g_assert(!fixture->has_been_provisional);
         fixture->has_been_provisional = TRUE;
         break;
@@ -184 +183 @@
         g_assert(fixture->has_been_load_error);
         g_assert(fixture->has_been_failed);
-        /* We are checking that only one FINISHED is received in the
-           whole cycle, so assert it's FALSE */
         g_assert(!fixture->has_been_finished);
         fixture->has_been_finished = TRUE;
@@ -222 +219 @@
 
     g_main_loop_run(fixture->loop);
+
+    g_assert(fixture->has_been_provisional);
+    g_assert(fixture->has_been_committed);
+    g_assert(fixture->has_been_load_error);
+    g_assert(fixture->has_been_failed);
+    g_assert(fixture->has_been_finished);
 }
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -2428 +2428 @@
     *
     * Connect to "notify::load-status" to monitor loading.
+    *
+    * Some versions of WebKitGTK+ emitted this signal for the default
+    * error page, while loading it. This behavior was considered bad,
+    * because it was essentially exposing an implementation
+    * detail. From 1.1.19 onwards this signal is no longer emitted for
+    * the default error pages, but keep in mind that if you override
+    * the error pages by using webkit_web_frame_load_alternate_string()
+    * the signals will be emitted.
     *
     * Since: 1.1.7