<!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>[201447] 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/201447">201447</a></dd>
<dt>Author</dt> <dd>yoav@yoav.ws</dd>
<dt>Date</dt> <dd>2016-05-26 22:43:52 -0700 (Thu, 26 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Preload single download tests.
https://bugs.webkit.org/show_bug.cgi?id=157988
Reviewed by Alex Christensen.
Source/WebCore:
ResourceTiming entries for some subresource weren't registered as resource->response().isHTTP() was false, since
resource->response().url() was empty. I switched the check to use resource->resourceRequest().url() directly instead.
Test: http/tests/preload/single_download_preload_runner.html
* loader/ResourceTimingInformation.cpp:
(WebCore::ResourceTimingInformation::addResourceTiming):
LayoutTests:
Make sure preload is only downloading a single resource, which is properly reused.
* http/tests/preload/resources/single_download_preload.html: Added.
* http/tests/preload/single_download_preload_runner-expected.txt: Added.
* http/tests/preload/single_download_preload_runner.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceTimingInformationcpp">trunk/Source/WebCore/loader/ResourceTimingInformation.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/http/tests/preload/resources/</li>
<li><a href="#trunkLayoutTestshttptestspreloadresourcessingle_download_preloadhtml">trunk/LayoutTests/http/tests/preload/resources/single_download_preload.html</a></li>
<li><a href="#trunkLayoutTestshttptestspreloadsingle_download_preload_runnerexpectedtxt">trunk/LayoutTests/http/tests/preload/single_download_preload_runner-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestspreloadsingle_download_preload_runnerhtml">trunk/LayoutTests/http/tests/preload/single_download_preload_runner.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201446 => 201447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-27 05:40:15 UTC (rev 201446)
+++ trunk/LayoutTests/ChangeLog 2016-05-27 05:43:52 UTC (rev 201447)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-26 Yoav Weiss <yoav@yoav.ws>
+
+ Preload single download tests.
+ https://bugs.webkit.org/show_bug.cgi?id=157988
+
+ Reviewed by Alex Christensen.
+
+ Make sure preload is only downloading a single resource, which is properly reused.
+
+ * http/tests/preload/resources/single_download_preload.html: Added.
+ * http/tests/preload/single_download_preload_runner-expected.txt: Added.
+ * http/tests/preload/single_download_preload_runner.html: Added.
+
</ins><span class="cx"> 2016-05-26 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadresourcessingle_download_preloadhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/preload/resources/single_download_preload.html (0 => 201447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/resources/single_download_preload.html (rev 0)
+++ trunk/LayoutTests/http/tests/preload/resources/single_download_preload.html 2016-05-27 05:43:52 UTC (rev 201447)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE html>
+<link rel=preload href="../../resources/dummy.js" as=script>
+<link rel=preload href="../../resources/dummy.css" as=style>
+<link rel=preload href="../../resources/square100.png" as=image>
+<link rel=preload href="../../resources/square100.png?background" as=image>
+<link rel=preload href="../../w3c/webperf/resources/Ahem.ttf" as=font crossorigin>
+<link rel=preload href="../../resources/test.mp4" as=media>
+<link rel=preload href="../../resources/test.oga" as=media>
+<link rel=preload href="../../security/resources/captions.vtt" as=track>
+<link rel=preload href="../../resources/dummy.xml" as=foobarxmlthing>
+<link rel=preload href="../../resources/dummy.xml">
+<script src="../../resources/slow-script.pl?delay=200"></script>
+<style>
+ #background {
+ width: 200px;
+ height: 200px;
+ background-image: url(../../resources/square100.png?background);
+ }
+ @font-face {
+ font-family:ahem;
+ src: url(../../w3c/webperf/resources/Ahem.ttf);
+ }
+ span { font-family: ahem, Arial; }
+</style>
+<link rel="stylesheet" href="../../resources/dummy.css">
+<script src="../../resources/dummy.js"></script>
+<div id="background"></div>
+<img src="../../resources/square100.png">
+<video src="../../resources/test.mp4">
+ <track kind=subtitles src="../../security/resources/captions.vtt" srclang=en>
+</video>
+<audio src="../../resources/test.oga"></audio>
+<script>
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "../../resources/dummy.xml");
+ xhr.send();
+
+ window.addEventListener("load", function() {
+ var entries = performance.getEntriesByType("resource");
+ message = performance.getEntriesByType("resource").length;
+ parent.postMessage(message, "*");
+ });
+</script>
+<span>this text is here just so that the browser will download the font.</span>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadsingle_download_preload_runnerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/preload/single_download_preload_runner-expected.txt (0 => 201447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/single_download_preload_runner-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/preload/single_download_preload_runner-expected.txt 2016-05-27 05:43:52 UTC (rev 201447)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+CONSOLE MESSAGE: line 10: <link rel=preload> must have a valid `as` value
+
+
+PASS Makes sure that preloaded resources are not downloaded again when used
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadsingle_download_preload_runnerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/preload/single_download_preload_runner.html (0 => 201447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/single_download_preload_runner.html (rev 0)
+++ trunk/LayoutTests/http/tests/preload/single_download_preload_runner.html 2016-05-27 05:43:52 UTC (rev 201447)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<script src="../w3c/resources/testharness.js"></script>
+<script src="../w3c/resources/testharnessreport.js"></script>
+<script>
+ if (window.internals) {
+ internals.setLinkPreloadSupport(true);
+ internals.setResourceTimingSupport(true);
+ }
+ var t = async_test('Makes sure that preloaded resources are not downloaded again when used');
+
+ window.addEventListener("message", t.step_func(function(event) {
+ var data = event.data;
+ assert_equals(data, 10, "The number of resource downloads");
+ if (window.internals) {
+ internals.setLinkPreloadSupport(false);
+ internals.setResourceTimingSupport(false);
+ }
+ t.done();
+ }));
+</script>
+<iframe src="resources/single_download_preload.html" onerror="assert_unreached();t.done()"></iframe>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201446 => 201447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-27 05:40:15 UTC (rev 201446)
+++ trunk/Source/WebCore/ChangeLog 2016-05-27 05:43:52 UTC (rev 201447)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-26 Yoav Weiss <yoav@yoav.ws>
+
+ Preload single download tests.
+ https://bugs.webkit.org/show_bug.cgi?id=157988
+
+ Reviewed by Alex Christensen.
+
+ ResourceTiming entries for some subresource weren't registered as resource->response().isHTTP() was false, since
+ resource->response().url() was empty. I switched the check to use resource->resourceRequest().url() directly instead.
+
+ Test: http/tests/preload/single_download_preload_runner.html
+
+ * loader/ResourceTimingInformation.cpp:
+ (WebCore::ResourceTimingInformation::addResourceTiming):
+
</ins><span class="cx"> 2016-05-26 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Wrong CharacterOffset from VisiblePosition with composed characters
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceTimingInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceTimingInformation.cpp (201446 => 201447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceTimingInformation.cpp 2016-05-27 05:40:15 UTC (rev 201446)
+++ trunk/Source/WebCore/loader/ResourceTimingInformation.cpp 2016-05-27 05:43:52 UTC (rev 201447)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> void ResourceTimingInformation::addResourceTiming(CachedResource* resource, Document* document)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled());
</span><del>- if (resource && resource->response().isHTTP()
</del><ins>+ if (resource && resource->resourceRequest().url().protocolIsInHTTPFamily()
</ins><span class="cx"> && ((!resource->errorOccurred() && !resource->wasCanceled()) || resource->response().httpStatusCode() == 304)) {
</span><span class="cx"> HashMap<CachedResource*, InitiatorInfo>::iterator initiatorIt = m_initiatorMap.find(resource);
</span><span class="cx"> if (initiatorIt != m_initiatorMap.end() && initiatorIt->value.added == NotYetAdded) {
</span></span></pre>
</div>
</div>
</body>
</html>