<!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>[201415] 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/201415">201415</a></dd>
<dt>Author</dt> <dd>yoav@yoav.ws</dd>
<dt>Date</dt> <dd>2016-05-25 22:34:27 -0700 (Wed, 25 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix ResourceTiming multiple entries per resource and test initiator
https://bugs.webkit.org/show_bug.cgi?id=158094
Reviewed by Alex Christensen.
Make sure that CachedResource that was needed by two different elements only adds one entry, with the right (first) initiatorType.
Source/WebCore:
Tests: http/tests/performance/performance-resource-timing-initiator-css.html
http/tests/performance/performance-resource-timing-initiator-no-override.html
* loader/ResourceTimingInformation.cpp:
(WebCore::ResourceTimingInformation::addResourceTiming): Don't remove CachedResource when entry is added, but
mark it as added. Only add new entries for non-added resources.
(WebCore::ResourceTimingInformation::storeResourceTimingInitiatorInformation): Initialize initiator info as NotYetAdded.
* loader/ResourceTimingInformation.h:
LayoutTests:
* http/tests/performance/performance-resource-timing-initiator-css.html: Added. Makes sure css has the right initiator type.
* http/tests/performance/performance-resource-timing-initiator-css-expected.txt: Added.
* http/tests/performance/performance-resource-timing-initiator-no-override.html: Added. Makes sure that only one entry is added and
that its initiator info doesn't get overriden.
* http/tests/performance/performance-resource-timing-initiator-no-override-expected.txt: 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>
<li><a href="#trunkSourceWebCoreloaderResourceTimingInformationh">trunk/Source/WebCore/loader/ResourceTimingInformation.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsperformanceperformanceresourcetiminginitiatorcssexpectedtxt">trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsperformanceperformanceresourcetiminginitiatorcsshtml">trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css.html</a></li>
<li><a href="#trunkLayoutTestshttptestsperformanceperformanceresourcetiminginitiatornooverrideexpectedtxt">trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsperformanceperformanceresourcetiminginitiatornooverridehtml">trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201414 => 201415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-26 05:33:58 UTC (rev 201414)
+++ trunk/LayoutTests/ChangeLog 2016-05-26 05:34:27 UTC (rev 201415)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-05-25 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><ins>+ Fix ResourceTiming multiple entries per resource and test initiator
+ https://bugs.webkit.org/show_bug.cgi?id=158094
+
+ Reviewed by Alex Christensen.
+
+ Make sure that CachedResource that was needed by two different elements only adds one entry, with the right (first) initiatorType.
+
+ * http/tests/performance/performance-resource-timing-initiator-css.html: Added. Makes sure css has the right initiator type.
+ * http/tests/performance/performance-resource-timing-initiator-css-expected.txt: Added.
+ * http/tests/performance/performance-resource-timing-initiator-no-override.html: Added. Makes sure that only one entry is added and
+ that its initiator info doesn't get overriden.
+ * http/tests/performance/performance-resource-timing-initiator-no-override-expected.txt: Added.
+
+2016-05-25 Yoav Weiss <yoav@yoav.ws>
+
</ins><span class="cx"> Fix ResourceTiming XHR flakiness
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158019
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsperformanceperformanceresourcetiminginitiatorcssexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css-expected.txt (0 => 201415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css-expected.txt 2016-05-26 05:34:27 UTC (rev 201415)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS initiator is "css"
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsperformanceperformanceresourcetiminginitiatorcsshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css.html (0 => 201415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css.html (rev 0)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css.html 2016-05-26 05:34:27 UTC (rev 201415)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<script>
+ if (window.internals)
+ internals.setResourceTimingSupport(true);
+ if (window.testRunner) {
+ testRunner.dumpAsText()
+ testRunner.waitUntilDone();
+ }
+</script>
+<script src="../../resources/js-test-pre.js"></script>
+<body>
+<style>
+ body { background: url("../../resources/square100.png"); }
+</style>
+<script>
+ var initiator;
+ var runTest = function() {
+ var resources = performance.getEntriesByType('resource');
+ for (var i = 0; i < resources.length; ++i) {
+ if (resources[i].name.indexOf("square") != -1) {
+ initiator = resources[i].initiatorType;
+ shouldBeEqualToString("initiator", "css");
+ }
+ };
+ if (window.internals)
+ window.internals.setResourceTimingSupport(false);
+ if (window.testRunner)
+ testRunner.notifyDone();
+ };
+ window.addEventListener("load", function() {
+ runTest();
+ });
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsperformanceperformanceresourcetiminginitiatornooverrideexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override-expected.txt (0 => 201415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override-expected.txt 2016-05-26 05:34:27 UTC (rev 201415)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS initiator is "img"
+PASS foundResources is 1
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsperformanceperformanceresourcetiminginitiatornooverridehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override.html (0 => 201415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override.html (rev 0)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override.html 2016-05-26 05:34:27 UTC (rev 201415)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<script>
+ if (window.internals)
+ internals.setResourceTimingSupport(true);
+ if (window.testRunner) {
+ testRunner.dumpAsText()
+ testRunner.waitUntilDone();
+ }
+</script>
+<script src="../../resources/js-test-pre.js"></script>
+<body>
+<img src="../../resources/square100.png">
+<style>
+ body { background: url("../../resources/square100.png"); }
+</style>
+<script>
+ var initiator;
+ var foundResources = 0;
+ var runTest = function() {
+ var resources = performance.getEntriesByType('resource');
+ for (var i = 0; i < resources.length; ++i) {
+ if (resources[i].name.indexOf("square") != -1) {
+ ++foundResources;
+ initiator = resources[i].initiatorType;
+ shouldBeEqualToString("initiator", "img");
+ }
+ };
+ shouldBe("foundResources", "1");
+ if (window.internals)
+ window.internals.setResourceTimingSupport(false);
+ if (window.testRunner)
+ testRunner.notifyDone();
+ };
+ window.addEventListener("load", function() {
+ runTest();
+ });
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201414 => 201415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-26 05:33:58 UTC (rev 201414)
+++ trunk/Source/WebCore/ChangeLog 2016-05-26 05:34:27 UTC (rev 201415)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-05-25 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><ins>+ Fix ResourceTiming multiple entries per resource and test initiator
+ https://bugs.webkit.org/show_bug.cgi?id=158094
+
+ Reviewed by Alex Christensen.
+
+ Make sure that CachedResource that was needed by two different elements only adds one entry, with the right (first) initiatorType.
+
+ Tests: http/tests/performance/performance-resource-timing-initiator-css.html
+ http/tests/performance/performance-resource-timing-initiator-no-override.html
+
+ * loader/ResourceTimingInformation.cpp:
+ (WebCore::ResourceTimingInformation::addResourceTiming): Don't remove CachedResource when entry is added, but
+ mark it as added. Only add new entries for non-added resources.
+ (WebCore::ResourceTimingInformation::storeResourceTimingInitiatorInformation): Initialize initiator info as NotYetAdded.
+ * loader/ResourceTimingInformation.h:
+
+2016-05-25 Yoav Weiss <yoav@yoav.ws>
+
</ins><span class="cx"> Fix ResourceTiming XHR flakiness
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158019
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceTimingInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceTimingInformation.cpp (201414 => 201415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceTimingInformation.cpp 2016-05-26 05:33:58 UTC (rev 201414)
+++ trunk/Source/WebCore/loader/ResourceTimingInformation.cpp 2016-05-26 05:34:27 UTC (rev 201415)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> if (resource && resource->response().isHTTP()
</span><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><del>- if (initiatorIt != m_initiatorMap.end()) {
</del><ins>+ if (initiatorIt != m_initiatorMap.end() && initiatorIt->value.added == NotYetAdded) {
</ins><span class="cx"> ASSERT(document);
</span><span class="cx"> Document* initiatorDocument = document;
</span><span class="cx"> if (resource->type() == CachedResource::MainResource)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> ASSERT(initiatorDocument->domWindow()->performance());
</span><span class="cx"> const InitiatorInfo& info = initiatorIt->value;
</span><span class="cx"> initiatorDocument->domWindow()->performance()->addResourceTiming(info.name, initiatorDocument, resource->resourceRequest(), resource->response(), info.startTime, resource->loadFinishTime());
</span><del>- m_initiatorMap.remove(initiatorIt);
</del><ins>+ initiatorIt->value.added = Added;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -67,11 +67,11 @@
</span><span class="cx"> // <iframe>s should report the initial navigation requested by the parent document, but not subsequent navigations.
</span><span class="cx"> ASSERT(frame);
</span><span class="cx"> if (frame->ownerElement()) {
</span><del>- InitiatorInfo info = { frame->ownerElement()->localName(), monotonicallyIncreasingTime() };
</del><ins>+ InitiatorInfo info = { frame->ownerElement()->localName(), monotonicallyIncreasingTime(), NotYetAdded };
</ins><span class="cx"> m_initiatorMap.add(resource.get(), info);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- InitiatorInfo info = { request.initiatorName(), monotonicallyIncreasingTime() };
</del><ins>+ InitiatorInfo info = { request.initiatorName(), monotonicallyIncreasingTime(), NotYetAdded };
</ins><span class="cx"> m_initiatorMap.add(resource.get(), info);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceTimingInformationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceTimingInformation.h (201414 => 201415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceTimingInformation.h 2016-05-26 05:33:58 UTC (rev 201414)
+++ trunk/Source/WebCore/loader/ResourceTimingInformation.h 2016-05-26 05:34:27 UTC (rev 201415)
</span><span class="lines">@@ -45,9 +45,11 @@
</span><span class="cx"> void storeResourceTimingInitiatorInformation(const CachedResourceHandle<CachedResource>&, const CachedResourceRequest&, Frame*);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ enum AlreadyAdded { NotYetAdded, Added };
</ins><span class="cx"> struct InitiatorInfo {
</span><span class="cx"> AtomicString name;
</span><span class="cx"> double startTime;
</span><ins>+ AlreadyAdded added;
</ins><span class="cx"> };
</span><span class="cx"> HashMap<CachedResource*, InitiatorInfo> m_initiatorMap;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>