Title: [99699] trunk
- Revision
- 99699
- Author
- [email protected]
- Date
- 2011-11-09 06:00:52 -0800 (Wed, 09 Nov 2011)
Log Message
[Qt] 4 Layout test fail due to network error constant values clash with WebkitError enum values in FrameloaderclientQt
https://bugs.webkit.org/show_bug.cgi?id=71554
Patch by Deepak Sherveghar <[email protected]> on 2011-11-09
Reviewed by Simon Hausmann.
Source/WebKit/qt:
We should check the error domain when checking the error code in shouldFallBack()
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::shouldFallBack): added error domain check
LayoutTests:
Un-skip the 4 failing layout test, we now check the error domain along with the error code in shouldFallBack()
* platform/qt/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (99698 => 99699)
--- trunk/LayoutTests/ChangeLog 2011-11-09 13:59:39 UTC (rev 99698)
+++ trunk/LayoutTests/ChangeLog 2011-11-09 14:00:52 UTC (rev 99699)
@@ -1,3 +1,14 @@
+2011-11-09 Deepak Sherveghar <[email protected]>
+
+ [Qt] 4 Layout test fail due to network error constant values clash with WebkitError enum values in FrameloaderclientQt
+ https://bugs.webkit.org/show_bug.cgi?id=71554
+
+ Reviewed by Simon Hausmann.
+
+ Un-skip the 4 failing layout test, we now check the error domain along with the error code in shouldFallBack()
+
+ * platform/qt/Skipped:
+
2011-11-09 Balazs Kelemen <[email protected]>
WebKitTestRunner needs layoutTestController.dumpFrameLoadCallbacks
Modified: trunk/LayoutTests/platform/qt/Skipped (99698 => 99699)
--- trunk/LayoutTests/platform/qt/Skipped 2011-11-09 13:59:39 UTC (rev 99698)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-11-09 14:00:52 UTC (rev 99699)
@@ -2454,13 +2454,6 @@
svg/zoom/page/zoom-img-preserveAspectRatio-support-1.html
fast/backgrounds/size/contain-and-cover-zoomed.html
-# new bug revealed by r99071
-# https://bugs.webkit.org/show_bug.cgi?id=62108
-fast/overflow/overflow-height-float-not-removed-crash.html
-fast/overflow/overflow-height-float-not-removed-crash3.html
-fast/css/acid2-pixel.html
-fast/css/acid2.html
-
# REGRESSION(r99195)
# https://bugs.webkit.org/show_bug.cgi?id=70609
fast/viewport/viewport-83.html
Modified: trunk/Source/WebKit/qt/ChangeLog (99698 => 99699)
--- trunk/Source/WebKit/qt/ChangeLog 2011-11-09 13:59:39 UTC (rev 99698)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-11-09 14:00:52 UTC (rev 99699)
@@ -1,3 +1,15 @@
+2011-11-09 Deepak Sherveghar <[email protected]>
+
+ [Qt] 4 Layout test fail due to network error constant values clash with WebkitError enum values in FrameloaderclientQt
+ https://bugs.webkit.org/show_bug.cgi?id=71554
+
+ Reviewed by Simon Hausmann.
+
+ We should check the error domain when checking the error code in shouldFallBack()
+
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::shouldFallBack): added error domain check
+
2011-11-08 Simon Hausmann <[email protected]>
[Qt] Replace use of QApplication with QGuiApplication
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (99698 => 99699)
--- trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2011-11-09 13:59:39 UTC (rev 99698)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2011-11-09 14:00:52 UTC (rev 99699)
@@ -986,7 +986,20 @@
bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError& error)
{
- return !(error.isCancellation() || (error.errorCode() == WebKitErrorFrameLoadInterruptedByPolicyChange) || (error.errorCode() == WebKitErrorPluginWillHandleLoad));
+ DEFINE_STATIC_LOCAL(const ResourceError, cancelledError, (this->cancelledError(ResourceRequest())));
+ DEFINE_STATIC_LOCAL(const ResourceError, pluginWillHandleLoadError, (this->pluginWillHandleLoadError(ResourceResponse())));
+ DEFINE_STATIC_LOCAL(const ResourceError, errorInterruptedForPolicyChange, (this->interruptedForPolicyChangeError(ResourceRequest())));
+
+ if (error.errorCode() == cancelledError.errorCode() && error.domain() == cancelledError.domain())
+ return false;
+
+ if (error.errorCode() == errorInterruptedForPolicyChange.errorCode() && error.domain() == errorInterruptedForPolicyChange.domain())
+ return false;
+
+ if (error.errorCode() == pluginWillHandleLoadError.errorCode() && error.domain() == pluginWillHandleLoadError.domain())
+ return false;
+
+ return true;
}
WTF::PassRefPtr<WebCore::DocumentLoader> FrameLoaderClientQt::createDocumentLoader(const WebCore::ResourceRequest& request, const SubstituteData& substituteData)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
