Title: [210519] trunk
- Revision
- 210519
- Author
- aes...@apple.com
- Date
- 2017-01-09 13:31:02 -0800 (Mon, 09 Jan 2017)
Log Message
[QuickLook] Add a layout test for webkit.org/b/135651
https://bugs.webkit.org/show_bug.cgi?id=166855
Reviewed by Andreas Kling.
Tools:
* DumpRenderTree/mac/FrameLoadDelegate.mm:
(-[FrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]): Added output for
errors with code WebKitErrorCannotShowURL.
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame): Made the error output
not specific to WebKit2 error codes.
LayoutTests:
* quicklook/nil-response-mime-type-expected.txt: Added.
* quicklook/nil-response-mime-type.html: Added.
* quicklook/resources/nil-response-mime-type.xls: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (210518 => 210519)
--- trunk/LayoutTests/ChangeLog 2017-01-09 21:09:04 UTC (rev 210518)
+++ trunk/LayoutTests/ChangeLog 2017-01-09 21:31:02 UTC (rev 210519)
@@ -1,3 +1,14 @@
+2017-01-09 Andy Estes <aes...@apple.com>
+
+ [QuickLook] Add a layout test for webkit.org/b/135651
+ https://bugs.webkit.org/show_bug.cgi?id=166855
+
+ Reviewed by Andreas Kling.
+
+ * quicklook/nil-response-mime-type-expected.txt: Added.
+ * quicklook/nil-response-mime-type.html: Added.
+ * quicklook/resources/nil-response-mime-type.xls: Added.
+
2017-01-09 Beth Dakin <bda...@apple.com>
Add a test to ensure that preventDefault on touchmove prevents scrolling
Added: trunk/LayoutTests/quicklook/nil-response-mime-type-expected.txt (0 => 210519)
--- trunk/LayoutTests/quicklook/nil-response-mime-type-expected.txt (rev 0)
+++ trunk/LayoutTests/quicklook/nil-response-mime-type-expected.txt 2017-01-09 21:31:02 UTC (rev 210519)
@@ -0,0 +1,7 @@
+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
+frame "<!--framePath //<!--frame0-->-->" - (ErrorCodeCannotShowURL)
+main frame - didFinishLoadForFrame
+
Added: trunk/LayoutTests/quicklook/nil-response-mime-type.html (0 => 210519)
--- trunk/LayoutTests/quicklook/nil-response-mime-type.html (rev 0)
+++ trunk/LayoutTests/quicklook/nil-response-mime-type.html 2017-01-09 21:31:02 UTC (rev 210519)
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
+ }
+</script>
+<style>
+iframe {
+ width: 100vw;
+ height: 100vh;
+}
+</style>
+<iframe src=""
Added: trunk/LayoutTests/quicklook/resources/nil-response-mime-type.xls (0 => 210519)
--- trunk/LayoutTests/quicklook/resources/nil-response-mime-type.xls (rev 0)
+++ trunk/LayoutTests/quicklook/resources/nil-response-mime-type.xls 2017-01-09 21:31:02 UTC (rev 210519)
@@ -0,0 +1,7 @@
+<html>
+<body>
+The image below should not be displayed:
+<br>
+<img src=""
+</body>
+</html>
Modified: trunk/Tools/ChangeLog (210518 => 210519)
--- trunk/Tools/ChangeLog 2017-01-09 21:09:04 UTC (rev 210518)
+++ trunk/Tools/ChangeLog 2017-01-09 21:31:02 UTC (rev 210519)
@@ -1,3 +1,17 @@
+2017-01-09 Andy Estes <aes...@apple.com>
+
+ [QuickLook] Add a layout test for webkit.org/b/135651
+ https://bugs.webkit.org/show_bug.cgi?id=166855
+
+ Reviewed by Andreas Kling.
+
+ * DumpRenderTree/mac/FrameLoadDelegate.mm:
+ (-[FrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]): Added output for
+ errors with code WebKitErrorCannotShowURL.
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::didFailProvisionalLoadWithErrorForFrame): Made the error output
+ not specific to WebKit2 error codes.
+
2017-01-09 Antoine Quint <grao...@apple.com>
Support webkit-test-runner key-value pairs in http tests in DumpRenderTree
Modified: trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm (210518 => 210519)
--- trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm 2017-01-09 21:09:04 UTC (rev 210518)
+++ trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm 2017-01-09 21:31:02 UTC (rev 210519)
@@ -229,6 +229,10 @@
if (!done && gTestRunner->dumpFrameLoadCallbacks()) {
NSString *string = [NSString stringWithFormat:@"%@ - didFailProvisionalLoadWithError", [frame _drt_descriptionSuitableForTestResult]];
printf("%s\n", [string UTF8String]);
+ if (error.code == WebKitErrorCannotShowURL) {
+ string = [NSString stringWithFormat:@"%@ - (ErrorCodeCannotShowURL)", [frame _drt_descriptionSuitableForTestResult]];
+ printf("%s\n", [string UTF8String]);
+ }
}
if ([error domain] == NSURLErrorDomain && ([error code] == NSURLErrorServerCertificateHasUnknownRoot || [error code] == NSURLErrorServerCertificateUntrusted)) {
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (210518 => 210519)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2017-01-09 21:09:04 UTC (rev 210518)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2017-01-09 21:31:02 UTC (rev 210519)
@@ -703,7 +703,7 @@
dumpLoadEvent(frame, "didFailProvisionalLoadWithError");
auto code = WKErrorGetErrorCode(error);
if (code == kWKErrorCodeCannotShowURL)
- dumpLoadEvent(frame, "(kWKErrorCodeCannotShowURL)");
+ dumpLoadEvent(frame, "(ErrorCodeCannotShowURL)");
else if (code == kWKErrorCodeFrameLoadBlockedByContentBlocker)
dumpLoadEvent(frame, "(kWKErrorCodeFrameLoadBlockedByContentBlocker)");
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
