<!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>[214361] 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/214361">214361</a></dd>
<dt>Author</dt> <dd>yoav@yoav.ws</dd>
<dt>Date</dt> <dd>2017-03-24 11:41:42 -0700 (Fri, 24 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a warning for unused link preloads.
https://bugs.webkit.org/show_bug.cgi?id=165670
Reviewed by Youenn Fablet.
Source/WebCore:
This patch adds a warning message, to warn developers that are using
link preloads in cases where the downloaded resource is likely to
remain unused.
Test: http/tests/preload/unused_preload_warning.html
* dom/Document.cpp:
(WebCore::Document::prepareForDestruction): Stop the timer once the document is destructed.
* loader/LinkPreloadResourceClients.h: Add shouldMarkAsReferenced overides for the LinkPreloadResourceClient classes.
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::addClientToSet): Make sure LinkPreloadResourceClients don't set resource to be referenced.
* loader/cache/CachedResourceClient.h:
(WebCore::CachedResourceClient::shouldMarkAsReferenced): Make sure that ResourceClients mark preloads as referenced by default.
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::CachedResourceLoader): Initialize timer.
(WebCore::CachedResourceLoader::~CachedResourceLoader): Stop timer.
(WebCore::CachedResourceLoader::warnUnusedPreloads): Iterate over m_preloads and issue a warning for non-referenced preloads.
(WebCore::CachedResourceLoader::documentDidFinishLoadEvent): Trigger a timer if preloads weren't cleared at load time.
(WebCore::CachedResourceLoader::warnUnusedPreloads): Triggered by the timer, and called CachedResourceLoader::warnUnusedPreloads.
(WebCore::CachedResourceLoader::stopUnusedPreloadsTimer): Stop the timer.
LayoutTests:
This adds a test for the unused preload warning, and adapts some of the other preload tests,
to avoid warnings.
* http/tests/preload/download_resources-expected.txt: Changed.
* http/tests/preload/download_resources.html: Added references to preloaded resources.
* http/tests/preload/onerrer_event-expected.txt: Changed.
* http/tests/preload/onerror_event.html: Added references to preloaded resources.
* http/tests/preload/onload_event.html: Added references to preloaded resources.
* http/tests/preload/resources/single_download_preload.html: Deflaked.
* http/tests/preload/unused_preload_warning-expected.txt: Added.
* http/tests/preload/unused_preload_warning.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestspreloaddownload_resourcesexpectedtxt">trunk/LayoutTests/http/tests/preload/download_resources-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestspreloaddownload_resourceshtml">trunk/LayoutTests/http/tests/preload/download_resources.html</a></li>
<li><a href="#trunkLayoutTestshttptestspreloadonerror_eventexpectedtxt">trunk/LayoutTests/http/tests/preload/onerror_event-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestspreloadonerror_eventhtml">trunk/LayoutTests/http/tests/preload/onerror_event.html</a></li>
<li><a href="#trunkLayoutTestshttptestspreloadonload_eventexpectedtxt">trunk/LayoutTests/http/tests/preload/onload_event-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestspreloadonload_eventhtml">trunk/LayoutTests/http/tests/preload/onload_event.html</a></li>
<li><a href="#trunkLayoutTestshttptestspreloadsingle_download_preloadhtml">trunk/LayoutTests/http/tests/preload/single_download_preload.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkPreloadResourceClientsh">trunk/Source/WebCore/loader/LinkPreloadResourceClients.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceClienth">trunk/Source/WebCore/loader/cache/CachedResourceClient.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoaderh">trunk/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestspreloadunused_preload_warningexpectedtxt">trunk/LayoutTests/http/tests/preload/unused_preload_warning-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestspreloadunused_preload_warninghtml">trunk/LayoutTests/http/tests/preload/unused_preload_warning.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/LayoutTests/ChangeLog        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-24 Yoav Weiss <yoav@yoav.ws>
+
+ Add a warning for unused link preloads.
+ https://bugs.webkit.org/show_bug.cgi?id=165670
+
+ Reviewed by Youenn Fablet.
+
+ This adds a test for the unused preload warning, and adapts some of the other preload tests,
+ to avoid warnings.
+
+ * http/tests/preload/download_resources-expected.txt: Changed.
+ * http/tests/preload/download_resources.html: Added references to preloaded resources.
+ * http/tests/preload/onerrer_event-expected.txt: Changed.
+ * http/tests/preload/onerror_event.html: Added references to preloaded resources.
+ * http/tests/preload/onload_event.html: Added references to preloaded resources.
+ * http/tests/preload/resources/single_download_preload.html: Deflaked.
+ * http/tests/preload/unused_preload_warning-expected.txt: Added.
+ * http/tests/preload/unused_preload_warning.html: Added.
+
</ins><span class="cx"> 2017-03-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Handle recursive calls to ProcessingInstruction::checkStyleSheet
</span></span></pre></div>
<a id="trunkLayoutTestshttptestspreloaddownload_resourcesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/preload/download_resources-expected.txt (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/download_resources-expected.txt        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/LayoutTests/http/tests/preload/download_resources-expected.txt        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -1,13 +1,5 @@
</span><del>-CONSOLE MESSAGE: line 11: <link rel=preload> must have a valid `as` value
-PASS internals.isPreloaded('../resources/dummy.js'); is true
-PASS internals.isPreloaded('../resources/dummy.css'); is true
-PASS internals.isPreloaded('../resources/square.png'); is true
-PASS internals.isPreloaded('../resources/Ahem.ttf'); is true
-PASS internals.isPreloaded('../resources/test.mp4'); is true
-PASS internals.isPreloaded('../security/resources/captions.vtt'); is true
-PASS internals.isPreloaded('../resources/dummy.xml?badvalue'); is false
-PASS internals.isPreloaded('../resources/dummy.xml'); is true
-PASS successfullyParsed is true
</del><ins>+CONSOLE MESSAGE: line 13: <link rel=preload> must have a valid `as` value
+This test makes sure that link preload preloads resources
</ins><span class="cx">
</span><del>-TEST COMPLETE
</del><ins>+PASS Makes sure that preloaded resources are downloaded
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestspreloaddownload_resourceshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/preload/download_resources.html (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/download_resources.html        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/LayoutTests/http/tests/preload/download_resources.html        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -1,27 +1,43 @@
</span><span class="cx"> <!DOCTYPE html>
</span><del>-<html>
-<head>
-<script src="/js-test-resources/js-test.js"></script>
</del><ins>+<script src="/js-test-resources/testharness.js"></script>
+<script src="/js-test-resources/testharnessreport.js"></script>
+<script>
+ var t = async_test('Makes sure that preloaded resources are downloaded');
+</script>
</ins><span class="cx"> <link rel=preload href="../resources/dummy.js" as=script>
</span><span class="cx"> <link rel=preload href="../resources/dummy.css" as=style>
</span><del>-<link rel=preload href="../resources/square.png" as=image>
-<link rel=preload href="../resources/Ahem.ttf" as=font crossorigin>
</del><ins>+<link rel=preload href="../resources/square100.png" as=image>
+<link rel=preload href="../resources/Ahem.woff" as=font crossorigin>
</ins><span class="cx"> <link rel=preload href="../resources/test.mp4" as=media>
</span><span class="cx"> <link rel=preload href="../security/resources/captions.vtt" as=track>
</span><span class="cx"> <link rel=preload href="../resources/dummy.xml?badvalue" as=foobarxmlthing>
</span><span class="cx"> <link rel=preload href="../resources/dummy.xml">
</span><del>-<script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>
-</head>
-<body>
</del><ins>+<script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=400"></script>
</ins><span class="cx"> <script>
</span><del>- if (window.testRunner)
- testRunner.dumpAsText();
- shouldBeTrue("internals.isPreloaded('../resources/dummy.js');");
- shouldBeTrue("internals.isPreloaded('../resources/dummy.css');");
- shouldBeTrue("internals.isPreloaded('../resources/square.png');");
- shouldBeTrue("internals.isPreloaded('../resources/Ahem.ttf');");
- shouldBeTrue("internals.isPreloaded('../resources/test.mp4');");
- shouldBeTrue("internals.isPreloaded('../security/resources/captions.vtt');");
- shouldBeFalse("internals.isPreloaded('../resources/dummy.xml?badvalue');");
- shouldBeTrue("internals.isPreloaded('../resources/dummy.xml');");
</del><ins>+ setTimeout(t.step_func(function() {
+ assert_true(internals.isPreloaded("../resources/dummy.js"));
+ assert_true(internals.isPreloaded("../resources/dummy.css"));
+ assert_true(internals.isPreloaded("../resources/square100.png"));
+ // FIXME: RT doesn't show downloads for the resources below. Need to investigate why.
+ assert_true(internals.isPreloaded("../resources/Ahem.woff"));
+ assert_true(internals.isPreloaded("../resources/test.mp4"));
+ assert_true(internals.isPreloaded("../security/resources/captions.vtt"));
+ assert_false(internals.isPreloaded("../resources/dummy.xml?badvalue"));
+ assert_true(internals.isPreloaded("../resources/dummy.xml"));
+ document.write('<script src="../resources/dummy.js"></scr' + 'ipt>' +
+ '<link rel=stylesheet href="../resources/dummy.css">' +
+ '<img src="../resources/square100.png">' +
+ '<video><source src="../resources/test.mp4">' +
+ '<track kind=subtitles src="../security/resources/captions.vtt" srclang=en>' +
+ '</video>' +
+ '<style>' +
+ ' @font-face { font-family:ahem; src: url(../resources/Ahem.woff); }' +
+ ' span { font-family: ahem, Arial; }' +
+ '</style>' +
+ '<span>This test makes sure that link preload preloads resources</span>');
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "../resources/dummy.xml");
+ xhr.send();
+ t.done();
+ }));
</ins><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadonerror_eventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/preload/onerror_event-expected.txt (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/onerror_event-expected.txt        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/LayoutTests/http/tests/preload/onerror_event-expected.txt        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -1,12 +1,5 @@
</span><del>-CONSOLE MESSAGE: line 27: <link rel=preload> must have a valid `as` value
-PASS successfullyParsed is true
</del><ins>+CONSOLE MESSAGE: line 25: <link rel=preload> must have a valid `as` value
+This test makes sure that link preload triggers error events for non-existing resources.
</ins><span class="cx">
</span><del>-TEST COMPLETE
-PASS styleFailed is true
-PASS scriptFailed is true
-PASS imageFailed is true
-PASS fontFailed is true
-PASS trackFailed is true
-PASS gibrishFailed is true
-PASS noTypeFailed is true
</del><ins>+PASS Makes sure that preloaded resources trigger onerror
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadonerror_eventhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/preload/onerror_event.html (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/onerror_event.html        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/LayoutTests/http/tests/preload/onerror_event.html        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -1,11 +1,9 @@
</span><span class="cx"> <!DOCTYPE html>
</span><ins>+<script src="/js-test-resources/testharness.js"></script>
+<script src="/js-test-resources/testharnessreport.js"></script>
</ins><span class="cx"> <script>
</span><del>- if (window.testRunner) {
- testRunner.dumpAsText()
- testRunner.waitUntilDone();
- }
</del><ins>+ var t = async_test('Makes sure that preloaded resources trigger onerror');
</ins><span class="cx"> </script>
</span><del>-<script src="/js-test-resources/js-test.js"></script>
</del><span class="cx"> <script>
</span><span class="cx"> var scriptFailed = false;
</span><span class="cx"> var styleFailed = false;
</span><span class="lines">@@ -27,20 +25,36 @@
</span><span class="cx"> <link rel=preload href="../non-existent/dummy.xml" as=foobarxmlthing onerror="count();gibrishFailed = true;" onload="count();">
</span><span class="cx"> <link rel=preload href="http://127.0.0.1:9999/non-existent/dummy.xml" onerror="count();noTypeFailed = true;" onload="count();">
</span><span class="cx"> <script>
</span><ins>+ document.write('<script src="../non-existent/dummy.js"></scr' + 'ipt>' +
+ '<link rel=stylesheet href="../non-existent/dummy.css">' +
+ '<img src="../non-existent/square.png">' +
+ '<video><source src="test.mp4">' +
+ '<track kind=subtitles src="../../non-existent/security/captions.vtt" srclang=en>' +
+ '</video>' +
+ '<style>' +
+ ' @font-face { font-family:ahem; src: url(../../non-existent/Ahem.ttf); }' +
+ ' span { font-family: ahem, Arial; }' +
+ '</style>' +
+ '<span>This test makes sure that link preload triggers error events for non-existing resources.</span>');
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "../non-existent/dummy.xml");
+ xhr.send();
+ var xhr2 = new XMLHttpRequest();
+ xhr2.open("GET", "http://127.0.0.1:9999/non-existent/dummy.xml");
+ xhr2.send();
</ins><span class="cx"> function test() {
</span><del>- shouldBeTrue("styleFailed");
- shouldBeTrue("scriptFailed");
- shouldBeTrue("imageFailed");
- shouldBeTrue("fontFailed");
- shouldBeTrue("trackFailed");
- shouldBeTrue("gibrishFailed");
- shouldBeTrue("noTypeFailed");
- if (window.testRunner)
- testRunner.notifyDone();
</del><ins>+ assert_true(styleFailed);
+ assert_true(scriptFailed);
+ assert_true(imageFailed);
+ assert_true(fontFailed);
+ assert_true(trackFailed);
+ assert_true(gibrishFailed);
+ assert_true(noTypeFailed);
+ t.done();
</ins><span class="cx"> };
</span><del>- setInterval(function() {
</del><ins>+ setInterval(t.step_func(function() {
</ins><span class="cx"> if (window.counter >= 7)
</span><span class="cx"> test();
</span><del>- }, 100);
</del><ins>+ }, 100));
</ins><span class="cx"> </script>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadonload_eventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/preload/onload_event-expected.txt (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/onload_event-expected.txt        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/LayoutTests/http/tests/preload/onload_event-expected.txt        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -15,4 +15,4 @@
</span><span class="cx"> PASS xsltErrored is true
</span><span class="cx"> PASS noTypeLoaded is true
</span><span class="cx"> PASS emptyTypeLoaded is true
</span><del>-
</del><ins>+This test makes sure that link preload events are fired
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadonload_eventhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/preload/onload_event.html (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/onload_event.html        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/LayoutTests/http/tests/preload/onload_event.html        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> <link rel=preload href="../resources/square100.png" as=image onload="count(); imageLoaded = true;" onerror="count()">
</span><span class="cx"> <link rel=preload href="../resources/Ahem.woff" as=font crossorigin onload="count(); fontLoaded = true;" onerror="count()">
</span><span class="cx"> <link rel=preload href="../resources/test.ogv" as=media onload="count(); mediaLoaded = true;" onerror="count()">
</span><del>-<link rel=preload href="../security/resources/captions.vtt" as=track onload="count(); trackLoaded = true;" onerror="count()">
</del><ins>+<link rel=preload href="../security/resources/captions.vtt" as=track onload="count(); trackLoaded = true;" onerror="count();">
</ins><span class="cx"> <link rel=preload href="../resources/dummy.xml" as=foobarxmlthing onload="count(); gibberishLoaded = true;" onerror="count(); gibberishErrored = true;">
</span><span class="cx"> <link rel=preload href="../resources/dummy.xslt" as=xslt onload="count(); xsltLoaded = true;" onerror="count(); xsltErrored = true;">
</span><span class="cx"> <link rel=preload href="../resources/dummy.xml" onload="count(); noTypeLoaded = true;" onerror="count()">
</span><span class="lines">@@ -51,7 +51,24 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> }
</span><del>- addEventListener("load", function(){
</del><ins>+ document.write('<script src="../resources/dummy.js"></scr' + 'ipt>' +
+ '<link rel=stylesheet href="../resources/dummy.css">' +
+ '<img src="../resources/square.png">' +
+ '<video><source src="test.mp4">' +
+ '<track kind=subtitles src="../../security/resources/captions.vtt" srclang=en>' +
+ '</video>' +
+ '<style>' +
+ ' @font-face { font-family:ahem; src: url(../../w3c/webperf/resources/Ahem.ttf); }' +
+ ' span { font-family: ahem, Arial; }' +
+ '</style>' +
+ '<span>This test makes sure that link preload events are fired</span>');
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "../resources/dummy.xml");
+ xhr.send();
+ var xhr2 = new XMLHttpRequest();
+ xhr2.open("GET", "../resources/dummy.xml?badvalue");
+ xhr2.send();
+ addEventListener("load", function(){
</ins><span class="cx"> setInterval(function() {
</span><span class="cx"> if (window.counter >= 10)
</span><span class="cx"> test();
</span></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadsingle_download_preloadhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/preload/single_download_preload.html (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/single_download_preload.html        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/LayoutTests/http/tests/preload/single_download_preload.html        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -55,6 +55,12 @@
</span><span class="cx"> // FIXME: XHR should trigger a single download, but it downloads 2 resources instead.
</span><span class="cx"> verifyDownloadNumber("http://127.0.0.1:8000/resources/dummy.xml", 2);
</span><span class="cx"> // FIXME: We should verify for video and audio as well, but they seem to (flakily?) trigger multiple partial requests.
</span><ins>+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "../resources/dummy.xml");
+ xhr.send();
+ var xhr2 = new XMLHttpRequest();
+ xhr2.open("GET", "../resources/dummy.xml?badvalue");
+ xhr2.send();
</ins><span class="cx"> t.done();
</span><span class="cx"> }), 100);
</span><span class="cx"> }));
</span></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadunused_preload_warningexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/preload/unused_preload_warning-expected.txt (0 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/unused_preload_warning-expected.txt         (rev 0)
+++ trunk/LayoutTests/http/tests/preload/unused_preload_warning-expected.txt        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+CONSOLE MESSAGE: The resource http://127.0.0.1:8000/resources/square100.png?name=value was preloaded using link preload but not used within a few seconds from the window's load event. Please make sure it wasn't preloaded for nothing.
+ This test verifies that unused preload resources (and only unused ones) issue a warning.
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadunused_preload_warninghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/preload/unused_preload_warning.html (0 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/unused_preload_warning.html         (rev 0)
+++ trunk/LayoutTests/http/tests/preload/unused_preload_warning.html        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ }
+ window.onload = function() {
+ window.setTimeout(function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 4000);
+ };
+</script>
+<link rel="preload" as="image" href="../resources/square100.png">
+<link rel="preload" as="image" href="../resources/square100.png?name=value">
+<img src="../resources/square100.png">
+This test verifies that unused preload resources (and only unused ones) issue a warning.
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/Source/WebCore/ChangeLog        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2017-03-24 Yoav Weiss <yoav@yoav.ws>
+
+ Add a warning for unused link preloads.
+ https://bugs.webkit.org/show_bug.cgi?id=165670
+
+ Reviewed by Youenn Fablet.
+
+ This patch adds a warning message, to warn developers that are using
+ link preloads in cases where the downloaded resource is likely to
+ remain unused.
+
+ Test: http/tests/preload/unused_preload_warning.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::prepareForDestruction): Stop the timer once the document is destructed.
+ * loader/LinkPreloadResourceClients.h: Add shouldMarkAsReferenced overides for the LinkPreloadResourceClient classes.
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::addClientToSet): Make sure LinkPreloadResourceClients don't set resource to be referenced.
+ * loader/cache/CachedResourceClient.h:
+ (WebCore::CachedResourceClient::shouldMarkAsReferenced): Make sure that ResourceClients mark preloads as referenced by default.
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::CachedResourceLoader): Initialize timer.
+ (WebCore::CachedResourceLoader::~CachedResourceLoader): Stop timer.
+ (WebCore::CachedResourceLoader::warnUnusedPreloads): Iterate over m_preloads and issue a warning for non-referenced preloads.
+ (WebCore::CachedResourceLoader::documentDidFinishLoadEvent): Trigger a timer if preloads weren't cleared at load time.
+ (WebCore::CachedResourceLoader::warnUnusedPreloads): Triggered by the timer, and called CachedResourceLoader::warnUnusedPreloads.
+ (WebCore::CachedResourceLoader::stopUnusedPreloadsTimer): Stop the timer.
+
</ins><span class="cx"> 2017-03-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Handle recursive calls to ProcessingInstruction::checkStyleSheet
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/Source/WebCore/dom/Document.cpp        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -2276,6 +2276,8 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ m_cachedResourceLoader->stopUnusedPreloadsTimer();
+
</ins><span class="cx"> detachFromFrame();
</span><span class="cx">
</span><span class="cx"> m_hasPreparedForDestruction = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkPreloadResourceClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkPreloadResourceClients.h (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkPreloadResourceClients.h        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/Source/WebCore/loader/LinkPreloadResourceClients.h        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx"> void notifyFinished(CachedResource& resource) override { triggerEvents(resource); }
</span><span class="cx">
</span><span class="cx"> void clear() override { clearResource(*this); }
</span><ins>+ bool shouldMarkAsReferenced() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LinkPreloadScriptResourceClient(LinkLoader& loader, CachedScript& resource)
</span><span class="lines">@@ -114,6 +115,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void clear() override { clearResource(*this); }
</span><ins>+ bool shouldMarkAsReferenced() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LinkPreloadStyleResourceClient(LinkLoader& loader, CachedCSSStyleSheet& resource)
</span><span class="lines">@@ -135,6 +137,7 @@
</span><span class="cx"> void notifyFinished(CachedResource& resource) override { triggerEvents(resource); }
</span><span class="cx">
</span><span class="cx"> void clear() override { clearResource(*this); }
</span><ins>+ bool shouldMarkAsReferenced() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LinkPreloadImageResourceClient(LinkLoader& loader, CachedImage& resource)
</span><span class="lines">@@ -160,6 +163,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void clear() override { clearResource(*this); }
</span><ins>+ bool shouldMarkAsReferenced() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LinkPreloadFontResourceClient(LinkLoader& loader, CachedFont& resource)
</span><span class="lines">@@ -181,6 +185,7 @@
</span><span class="cx"> void notifyFinished(CachedResource& resource) override { triggerEvents(resource); }
</span><span class="cx">
</span><span class="cx"> void clear() override { clearResource(*this); }
</span><ins>+ bool shouldMarkAsReferenced() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LinkPreloadRawResourceClient(LinkLoader& loader, CachedRawResource& resource)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx">
</span><span class="cx"> bool CachedResource::addClientToSet(CachedResourceClient& client)
</span><span class="cx"> {
</span><del>- if (m_preloadResult == PreloadNotReferenced) {
</del><ins>+ if (m_preloadResult == PreloadNotReferenced && client.shouldMarkAsReferenced()) {
</ins><span class="cx"> if (isLoaded())
</span><span class="cx"> m_preloadResult = PreloadReferencedWhileComplete;
</span><span class="cx"> else if (m_requestedFromNetworkingLayer)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceClient.h (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceClient.h        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/Source/WebCore/loader/cache/CachedResourceClient.h        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx">
</span><span class="cx"> static CachedResourceClientType expectedType() { return BaseResourceType; }
</span><span class="cx"> virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
</span><ins>+ virtual bool shouldMarkAsReferenced() const { return true; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> CachedResourceClient() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -85,6 +85,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+// Timeout for link preloads to be used after window.onload
+static const int unusedPreloadTimeoutInSeconds = 3;
+
</ins><span class="cx"> static CachedResource* createResource(CachedResource::Type type, CachedResourceRequest&& request, SessionID sessionID)
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="lines">@@ -129,6 +132,7 @@
</span><span class="cx"> : m_document(nullptr)
</span><span class="cx"> , m_documentLoader(documentLoader)
</span><span class="cx"> , m_requestCount(0)
</span><ins>+ , m_unusedPreloadsTimer(*this, &CachedResourceLoader::warnUnusedPreloads)
</ins><span class="cx"> , m_garbageCollectDocumentResourcesTimer(*this, &CachedResourceLoader::garbageCollectDocumentResources)
</span><span class="cx"> , m_autoLoadImages(true)
</span><span class="cx"> , m_imagesEnabled(true)
</span><span class="lines">@@ -147,6 +151,7 @@
</span><span class="cx">
</span><span class="cx"> // Make sure no requests still point to this CachedResourceLoader
</span><span class="cx"> ASSERT(m_requestCount == 0);
</span><ins>+ m_unusedPreloadsTimer.stop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResource* CachedResourceLoader::cachedResource(const String& resourceURL) const
</span><span class="lines">@@ -821,8 +826,18 @@
</span><span class="cx"> void CachedResourceLoader::documentDidFinishLoadEvent()
</span><span class="cx"> {
</span><span class="cx"> m_validatedURLs.clear();
</span><ins>+
+ // If m_preloads is not empty here, it's full of link preloads,
+ // as speculative preloads were cleared at DCL.
+ if (m_preloads && m_preloads->size() && !m_unusedPreloadsTimer.isActive())
+ m_unusedPreloadsTimer.startOneShot(unusedPreloadTimeoutInSeconds);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void CachedResourceLoader::stopUnusedPreloadsTimer()
+{
+ m_unusedPreloadsTimer.stop();
+}
+
</ins><span class="cx"> CachedResourceHandle<CachedResource> CachedResourceLoader::revalidateResource(CachedResourceRequest&& request, CachedResource& resource)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(resource.inCache());
</span><span class="lines">@@ -1228,6 +1243,19 @@
</span><span class="cx"> return resource;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CachedResourceLoader::warnUnusedPreloads()
+{
+ if (!m_preloads)
+ return;
+ for (const auto& resource : *m_preloads) {
+ if (resource && resource->isLinkPreload() && resource->preloadResult() == CachedResource::PreloadNotReferenced && document()) {
+ document()->addConsoleMessage(MessageSource::Other, MessageLevel::Warning,
+ "The resource " + resource->url().string() +
+ " was preloaded using link preload but not used within a few seconds from the window's load event. Please make sure it wasn't preloaded for nothing.");
+ }
+ }
+}
+
</ins><span class="cx"> bool CachedResourceLoader::isPreloaded(const String& urlString) const
</span><span class="cx"> {
</span><span class="cx"> const URL& url = m_document->completeURL(urlString);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (214360 => 214361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h        2017-03-24 18:39:28 UTC (rev 214360)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h        2017-03-24 18:41:42 UTC (rev 214361)
</span><span class="lines">@@ -133,6 +133,8 @@
</span><span class="cx"> void clearPreloads(ClearPreloadsMode);
</span><span class="cx"> CachedResourceHandle<CachedResource> preload(CachedResource::Type, CachedResourceRequest&&);
</span><span class="cx"> void printPreloadStats();
</span><ins>+ void warnUnusedPreloads();
+ void stopUnusedPreloadsTimer();
</ins><span class="cx">
</span><span class="cx"> bool updateRequestAfterRedirection(CachedResource::Type, ResourceRequest&, const ResourceLoaderOptions&);
</span><span class="cx">
</span><span class="lines">@@ -188,6 +190,7 @@
</span><span class="cx"> int m_requestCount;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ListHashSet<CachedResource*>> m_preloads;
</span><ins>+ Timer m_unusedPreloadsTimer;
</ins><span class="cx">
</span><span class="cx"> Timer m_garbageCollectDocumentResourcesTimer;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>