<!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>[247271] trunk/LayoutTests</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/247271">247271</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-07-09 12:38:54 -0700 (Tue, 09 Jul 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove rel=subresource tests
https://bugs.webkit.org/show_bug.cgi?id=199616

Patch by Rob Buis <rbuis@igalia.com> on 2019-07-09
Reviewed by Ryosuke Niwa.

Remove rel=subresource references by deleting or using rel=prefetch
instead.

* TestExpectations:
* fast/dom/HTMLLinkElement/cachedresource-types.html:
* http/tests/misc/link-rel-prefetch-and-subresource.html: Removed.
* webarchive/test-link-rel-subresource-beforeload-expected.webarchive: Removed.
* webarchive/test-link-rel-subresource-beforeload.html: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLLinkElementcachedresourcetypeshtml">trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmisclinkrelprefetchandsubresourcehtml">trunk/LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource.html</a></li>
<li><a href="#trunkLayoutTestswebarchivetestlinkrelsubresourcebeforeloadexpectedwebarchive">trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload-expected.webarchive</a></li>
<li><a href="#trunkLayoutTestswebarchivetestlinkrelsubresourcebeforeloadhtml">trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (247270 => 247271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-07-09 19:25:57 UTC (rev 247270)
+++ trunk/LayoutTests/ChangeLog 2019-07-09 19:38:54 UTC (rev 247271)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2019-07-09  Rob Buis  <rbuis@igalia.com>
+
+        Remove rel=subresource tests
+        https://bugs.webkit.org/show_bug.cgi?id=199616
+
+        Reviewed by Ryosuke Niwa.
+
+        Remove rel=subresource references by deleting or using rel=prefetch
+        instead.
+
+        * TestExpectations:
+        * fast/dom/HTMLLinkElement/cachedresource-types.html:
+        * http/tests/misc/link-rel-prefetch-and-subresource.html: Removed.
+        * webarchive/test-link-rel-subresource-beforeload-expected.webarchive: Removed.
+        * webarchive/test-link-rel-subresource-beforeload.html: Removed.
+
</ins><span class="cx"> 2019-07-09  Antoine Quint  <graouts@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Pointer Events] Scroll indicators should not show for scrollable content with touch-action: none
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (247270 => 247271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations       2019-07-09 19:25:57 UTC (rev 247270)
+++ trunk/LayoutTests/TestExpectations  2019-07-09 19:38:54 UTC (rev 247271)
</span><span class="lines">@@ -2339,7 +2339,6 @@
</span><span class="cx"> webkit.org/b/3652 fast/dom/HTMLLinkElement/prefetch-onload.html [ Skip ]
</span><span class="cx"> webkit.org/b/3652 fast/dom/HTMLLinkElement/prefetch-too-many-clients.html [ Skip ]
</span><span class="cx"> webkit.org/b/3652 fast/dom/HTMLLinkElement/subresource.html [ Skip ]
</span><del>-webkit.org/b/3652 http/tests/misc/link-rel-prefetch-and-subresource.html [ Skip ]
</del><span class="cx"> webkit.org/b/3652 http/tests/misc/prefetch-purpose.html [ Skip ]
</span><span class="cx"> 
</span><span class="cx"> # First-party-only cookie policy only supported on Cocoa platforms.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLLinkElementcachedresourcetypeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html (247270 => 247271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html     2019-07-09 19:25:57 UTC (rev 247270)
+++ trunk/LayoutTests/fast/dom/HTMLLinkElement/cachedresource-types.html        2019-07-09 19:38:54 UTC (rev 247271)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx">     testRunner.dumpAsText();
</span><span class="cx"> 
</span><span class="cx"> </script>
</span><del>-<link rel="subresource" href="resources/does-not-exist.jpg"/>
</del><ins>+<link rel="prefetch" href="resources/does-not-exist.jpg"/>
</ins><span class="cx"> <img src="resources/does-not-exist.jpg">
</span><span class="cx"> 
</span><span class="cx"> This test passes if it does not crash.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmisclinkrelprefetchandsubresourcehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource.html (247270 => 247271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource.html 2019-07-09 19:25:57 UTC (rev 247270)
+++ trunk/LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource.html    2019-07-09 19:38:54 UTC (rev 247271)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-<html>
-<head>
-  <script>
-function CallCommand(cmd)
-{
- try {
-     var req = new XMLHttpRequest;
-     req.open("GET", "/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=" + cmd, false);
-     req.send(null);
-     return req.responseText;
- } catch (ex) {
-     return "";
- }
-}
-
-function startTest()
-{
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-}
-
-function endTest()
-{
-    getResourceLog();
-    CallCommand("clear-resource-request-log");
-
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function getResourceLog()
-{
-    var log = CallCommand("get-resource-request-log");
-    var logLines = log.split('\n');
-    logLines.sort();
-    document.getElementById('result').innerText = logLines.join('\n');
-}
-
-CallCommand("start-resource-request-log");
-window.addEventListener('load', startTest, false);
-  </script>
-
-  <!-- link rel=subresource is very similar to link rel=prefetch, however it is
-       expected to have a higher network priority.  This test should confirm that the
-       priorities of the two types of prefetch are being observed -->
-
-  <script>
-  var linkLoadCount = 5;
-
-  function decrementLinkLoadCount()
-  {
-      linkLoadCount--;
-      if (linkLoadCount == 0) {
-          endTest();
-      }
-  }
-  </script>
-  <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=1st.jpg">
-  <link rel=subresource onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=2nd.jpg">
-  <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=3rd.jpg">
-  <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=4th.jpg">
-  <link rel=subresource onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=5th.jpg">
-</head>
-<body>
-
-  <div class="box bordered"></div>
-
-  <h2>Resource requests:</h2>
-  <pre id="result">Request log goes here in DRT</pre>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestswebarchivetestlinkrelsubresourcebeforeloadexpectedwebarchive"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload-expected.webarchive (247270 => 247271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload-expected.webarchive    2019-07-09 19:25:57 UTC (rev 247270)
+++ trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload-expected.webarchive       2019-07-09 19:38:54 UTC (rev 247271)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>WebMainResource</key>
-       <dict>
-               <key>WebResourceData</key>
-               <string>&lt;html&gt;&lt;head&gt;
-&lt;script&gt;
-function runTest()
-{
-    if (window.testRunner) {
-        testRunner.dumpDOMAsWebArchive();
-        testRunner.queueReload();
-    }
-}
-&lt;/script&gt;
-&lt;/head&gt;
-&lt;body onload="runTest()"&gt;
-&lt;div id="console"&gt;&lt;div style="font-family: monospace; color: green;"&gt;PASS&lt;/div&gt;&lt;/div&gt;
-&lt;script&gt;
-function print(message, color) 
-{
-    var paragraph = document.createElement("div");
-    paragraph.appendChild(document.createTextNode(message));
-    paragraph.style.fontFamily = "monospace";
-    if (color)
-        paragraph.style.color = color;
-    document.getElementById("console").appendChild(paragraph);
-}
-&lt;/script&gt;
-&lt;p&gt;This test should have a green 'PASS' just above this line.  If it doesn't, you failed.
-&lt;link rel="subresource" onbeforeload="print('PASS','green');return false" href="resources/favicon.ico" type="image/x-icon"&gt;
-
-
-&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-               <key>WebResourceFrameName</key>
-               <string></string>
-               <key>WebResourceMIMEType</key>
-               <string>text/html</string>
-               <key>WebResourceTextEncodingName</key>
-               <string>UTF-8</string>
-               <key>WebResourceURL</key>
-               <string>file:///LayoutTests/webarchive/test-link-rel-subresource-beforeload.html</string>
-       </dict>
-</dict>
-</plist>
</del></span></pre></div>
<a id="trunkLayoutTestswebarchivetestlinkrelsubresourcebeforeloadhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload.html (247270 => 247271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload.html   2019-07-09 19:25:57 UTC (rev 247270)
+++ trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload.html      2019-07-09 19:38:54 UTC (rev 247271)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-<html>
-<head>
-<script>
-function runTest()
-{
-    if (window.testRunner) {
-        testRunner.dumpDOMAsWebArchive();
-        testRunner.queueReload();
-    }
-}
-</script>
-</head>
-<body onload="runTest()">
-<div id="console"></div>
-<script>
-function print(message, color) 
-{
-    var paragraph = document.createElement("div");
-    paragraph.appendChild(document.createTextNode(message));
-    paragraph.style.fontFamily = "monospace";
-    if (color)
-        paragraph.style.color = color;
-    document.getElementById("console").appendChild(paragraph);
-}
-</script>
-<p>This test should have a green 'PASS' just above this line.  If it doesn't, you failed.
-<link rel="subresource" onbeforeload="print('PASS','green');return false" href="resources/favicon.ico" type="image/x-icon">
-</body>
-</html>
</del></span></pre>
</div>
</div>

</body>
</html>