Title: [98138] trunk/Source/WebKit2
- Revision
- 98138
- Author
- commit-qu...@webkit.org
- Date
- 2011-10-21 13:52:11 -0700 (Fri, 21 Oct 2011)
Log Message
[WK2] WebFrameLoaderClient::shouldFallback() should use a port-specific implementation
https://bugs.webkit.org/show_bug.cgi?id=70055
Patch by Jesus Sanchez-Palencia <jesus.palen...@openbossa.org> on 2011-10-21
Reviewed by Luiz Agostini.
In QtWebKit 1, our FrameLoaderClient::shouldFallback was checking for InterruptedForPolicyChange
error. In WebKit2, we are relying on the common implementation for WebFrameLoaderClient::shouldFallback
which doesn't check for the same error. Here we add this check only for Qt.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::shouldFallBack):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98137 => 98138)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 20:51:47 UTC (rev 98137)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 20:52:11 UTC (rev 98138)
@@ -1,3 +1,17 @@
+2011-10-21 Jesus Sanchez-Palencia <jesus.palen...@openbossa.org>
+
+ [WK2] WebFrameLoaderClient::shouldFallback() should use a port-specific implementation
+ https://bugs.webkit.org/show_bug.cgi?id=70055
+
+ Reviewed by Luiz Agostini.
+
+ In QtWebKit 1, our FrameLoaderClient::shouldFallback was checking for InterruptedForPolicyChange
+ error. In WebKit2, we are relying on the common implementation for WebFrameLoaderClient::shouldFallback
+ which doesn't check for the same error. Here we add this check only for Qt.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::shouldFallBack):
+
2011-10-21 Anders Carlsson <ander...@apple.com>
Flash of white when loading a page after a web process crash
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (98137 => 98138)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2011-10-21 20:51:47 UTC (rev 98137)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2011-10-21 20:52:11 UTC (rev 98138)
@@ -990,6 +990,13 @@
if (error.errorCode() == pluginWillHandleLoadError.errorCode() && error.domain() == pluginWillHandleLoadError.domain())
return false;
+#if PLATFORM(QT)
+ DEFINE_STATIC_LOCAL(const ResourceError, errorInterruptedForPolicyChange, (this->interruptedForPolicyChangeError(ResourceRequest())));
+
+ if (error.errorCode() == errorInterruptedForPolicyChange.errorCode() && error.domain() == errorInterruptedForPolicyChange.domain())
+ return false;
+#endif
+
return true;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
