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

        Correctly handle cancellation and frame loading interruption
        caused by policy change.  This also fixes
        fast/frames/location-change.html.

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

git-svn-id: svn://svn.chromium.org/blink/trunk@42888 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
+
+        Correctly handle cancellation and frame loading interruption
+        caused by policy change.  This also fixes
+        fast/frames/location-change.html.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::shouldFallBack):
+
 2009-04-26  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Mark Rowe.

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

@@ -931,10 +931,9 @@ ResourceError FrameLoaderClient::pluginWillHandleLoadError(const ResourceRespons
 
 bool FrameLoaderClient::shouldFallBack(const ResourceError& error)
 {
-    // FIXME: Needs to check domain.
     // FIXME: Mac checks for WebKitErrorPlugInWillHandleLoad here to avoid
     // loading plugin content twice. Do we need it?
-    return error.errorCode() != WEBKIT_NETWORK_ERROR_CANCELLED;
+    return !(error.isCancellation() || error.errorCode() == WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE);
 }
 
 bool FrameLoaderClient::canCachePage() const