2009-04-27 Gustavo Noronha Silva <gns@gnome.org>

        Reviewed by Xan Lopez.

        https://bugs.webkit.org/show_bug.cgi?id=25409
        [GTK] incorrectly fallsback on cancellation

        Check whether we should fallback also on didFailLoad, so that we
        don't get error pages showing up in parts of the content of some
        sites because of, for instance, location changes.

        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::dispatchDidFailLoad):

git-svn-id: svn://svn.chromium.org/blink/trunk@42889 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebKit/gtk/ChangeLog

+2009-04-27  Gustavo Noronha Silva  <gns@gnome.org>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25409
+        [GTK] incorrectly fallsback on cancellation
+
+        Check whether we should fallback also on didFailLoad, so that we
+        don't get error pages showing up in parts of the content of some
+        sites because of, for instance, location changes.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::dispatchDidFailLoad):
+
 2009-04-27  Gustavo Noronha Silva  <gns@gnome.org>
 
         Reviewed by Xan Lopez.

third_party/WebKit/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -849,6 +849,13 @@ void FrameLoaderClient::dispatchDidFailLoad(const ResourceError& error)
         return;
     }
 
+    if (!shouldFallBack(error)) {
+        g_error_free(webError);
+        // FIXME: load-done is deprecated. Please remove when signal's been removed.
+        g_signal_emit_by_name(m_frame, "load-done", false);
+        return;
+    }
+
     String content;
     gchar* fileContent = 0;
     gchar* errorURI = g_filename_to_uri(DATA_DIR"/webkit-1.0/resources/error.html", NULL, NULL);