Title: [97398] trunk/Source/WebKit2
- Revision
- 97398
- Author
- [email protected]
- Date
- 2011-10-13 14:16:27 -0700 (Thu, 13 Oct 2011)
Log Message
[Qt][WK2] WebViews are emitting loadFailed for "private" error codes
https://bugs.webkit.org/show_bug.cgi?id=70047
Reviewed by Kenneth Rohde Christiansen.
Both QDesktopWebView and QTouchWebView are emitting loadFailed for private errors
like the ones defined in Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp.
We now filter these by not emitting this signal for FrameLoadInterruptedByPolicyChange,
PlugInWillHandleLoad and Cancellation, following previous decisions from WebKit 1.
* UIProcess/qt/ClientImpl.cpp:
(dispatchLoadFailed):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97397 => 97398)
--- trunk/Source/WebKit2/ChangeLog 2011-10-13 21:11:17 UTC (rev 97397)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-13 21:16:27 UTC (rev 97398)
@@ -1,3 +1,19 @@
+2011-10-13 Jesus Sanchez-Palencia <[email protected]>
+
+ [Qt][WK2] WebViews are emitting loadFailed for "private" error codes
+ https://bugs.webkit.org/show_bug.cgi?id=70047
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Both QDesktopWebView and QTouchWebView are emitting loadFailed for private errors
+ like the ones defined in Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp.
+
+ We now filter these by not emitting this signal for FrameLoadInterruptedByPolicyChange,
+ PlugInWillHandleLoad and Cancellation, following previous decisions from WebKit 1.
+
+ * UIProcess/qt/ClientImpl.cpp:
+ (dispatchLoadFailed):
+
2011-10-13 Ravi Phaneendra Kasibhatla <[email protected]>
Implement TextChecker for WebKit2 GTK+
Modified: trunk/Source/WebKit2/UIProcess/qt/ClientImpl.cpp (97397 => 97398)
--- trunk/Source/WebKit2/UIProcess/qt/ClientImpl.cpp 2011-10-13 21:11:17 UTC (rev 97397)
+++ trunk/Source/WebKit2/UIProcess/qt/ClientImpl.cpp 2011-10-13 21:16:27 UTC (rev 97398)
@@ -74,6 +74,11 @@
return;
toQtWebPageProxy(clientInfo)->updateNavigationActions();
+
+ int errorCode = WKErrorGetErrorCode(error);
+ if (toImpl(error)->platformError().isCancellation() || errorCode == kWKErrorCodeFrameLoadInterruptedByPolicyChange || errorCode == kWKErrorCodePlugInWillHandleLoad)
+ return;
+
toQtWebPageProxy(clientInfo)->loadDidFail(QWebErrorPrivate::createQWebError(error));
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
