<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[210519] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210519">210519</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2017-01-09 13:31:02 -0800 (Mon, 09 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacFrameLoadDelegatemm">trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsquicklooknilresponsemimetypeexpectedtxt">trunk/LayoutTests/quicklook/nil-response-mime-type-expected.txt</a></li>
<li><a href="#trunkLayoutTestsquicklooknilresponsemimetypehtml">trunk/LayoutTests/quicklook/nil-response-mime-type.html</a></li>
<li><a href="#trunkLayoutTestsquicklookresourcesnilresponsemimetypexls">trunk/LayoutTests/quicklook/resources/nil-response-mime-type.xls</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210518 => 210519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-09 21:09:04 UTC (rev 210518)
+++ trunk/LayoutTests/ChangeLog 2017-01-09 21:31:02 UTC (rev 210519)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-09 Andy Estes <aestes@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.
+
</ins><span class="cx"> 2017-01-09 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a test to ensure that preventDefault on touchmove prevents scrolling
</span></span></pre></div>
<a id="trunkLayoutTestsquicklooknilresponsemimetypeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/quicklook/nil-response-mime-type-expected.txt (0 => 210519)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError
+frame "<!--framePath //<!--frame0-->-->" - (ErrorCodeCannotShowURL)
+main frame - didFinishLoadForFrame
+
</ins></span></pre></div>
<a id="trunkLayoutTestsquicklooknilresponsemimetypehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/quicklook/nil-response-mime-type.html (0 => 210519)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
+ }
+</script>
+<style>
+iframe {
+ width: 100vw;
+ height: 100vh;
+}
+</style>
+<iframe src="resources/nil-response-mime-type.xls"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestsquicklookresourcesnilresponsemimetypexls"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/quicklook/resources/nil-response-mime-type.xls (0 => 210519)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<html>
+<body>
+The image below should not be displayed:
+<br>
+<img src="http://www.dnsupdate.org/DNSUpdate2.jpg">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210518 => 210519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-09 21:09:04 UTC (rev 210518)
+++ trunk/Tools/ChangeLog 2017-01-09 21:31:02 UTC (rev 210519)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-01-09 Andy Estes <aestes@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.
+
</ins><span class="cx"> 2017-01-09 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Support webkit-test-runner key-value pairs in http tests in DumpRenderTree
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacFrameLoadDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm (210518 => 210519)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -229,6 +229,10 @@
</span><span class="cx"> if (!done && gTestRunner->dumpFrameLoadCallbacks()) {
</span><span class="cx"> NSString *string = [NSString stringWithFormat:@"%@ - didFailProvisionalLoadWithError", [frame _drt_descriptionSuitableForTestResult]];
</span><span class="cx"> printf("%s\n", [string UTF8String]);
</span><ins>+ if (error.code == WebKitErrorCannotShowURL) {
+ string = [NSString stringWithFormat:@"%@ - (ErrorCodeCannotShowURL)", [frame _drt_descriptionSuitableForTestResult]];
+ printf("%s\n", [string UTF8String]);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([error domain] == NSURLErrorDomain && ([error code] == NSURLErrorServerCertificateHasUnknownRoot || [error code] == NSURLErrorServerCertificateUntrusted)) {
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (210518 => 210519)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -703,7 +703,7 @@
</span><span class="cx"> dumpLoadEvent(frame, "didFailProvisionalLoadWithError");
</span><span class="cx"> auto code = WKErrorGetErrorCode(error);
</span><span class="cx"> if (code == kWKErrorCodeCannotShowURL)
</span><del>- dumpLoadEvent(frame, "(kWKErrorCodeCannotShowURL)");
</del><ins>+ dumpLoadEvent(frame, "(ErrorCodeCannotShowURL)");
</ins><span class="cx"> else if (code == kWKErrorCodeFrameLoadBlockedByContentBlocker)
</span><span class="cx"> dumpLoadEvent(frame, "(kWKErrorCodeFrameLoadBlockedByContentBlocker)");
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>