<!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>[201414] 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/201414">201414</a></dd>
<dt>Author</dt> <dd>yoav@yoav.ws</dd>
<dt>Date</dt> <dd>2016-05-25 22:33:58 -0700 (Wed, 25 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix ResourceTiming XHR flakiness
https://bugs.webkit.org/show_bug.cgi?id=158019
Reviewed by Alex Christensen.
Source/WebCore:
Remove XHR specific ResourceTiming information store and addition as it is not needed.
Test: http/tests/performance/performance-resource-timing-xhr-single-entry.html
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::loadRequest): Removed XHR-specific initiator info storage.
(WebCore::DocumentThreadableLoader::didFinishLoading): Removed XHR-specific RT entry addition.
* loader/DocumentThreadableLoader.h:
LayoutTests:
Test fixes and additions that make sure XHR tests are not run as part of XHR's onload event, as ResourceTiming entries are added
after it.
* TestExpectations:
* http/tests/performance/performance-resource-timing-cached-entries.html: Avoid running the tests as part of the XHR's load event.
* http/tests/performance/performance-resource-timing-xhr-single-entry-expected.txt: Added.
* http/tests/performance/performance-resource-timing-xhr-single-entry.html: Test that XHR fetch adds a single entry with correct initiatorType.</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="#trunkLayoutTestshttptestsperformanceperformanceresourcetimingcachedentrieshtml">trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoaderh">trunk/Source/WebCore/loader/DocumentThreadableLoader.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsperformanceperformanceresourcetimingxhrsingleentryexpectedtxt">trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsperformanceperformanceresourcetimingxhrsingleentryhtml">trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201413 => 201414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-26 05:31:43 UTC (rev 201413)
+++ trunk/LayoutTests/ChangeLog 2016-05-26 05:33:58 UTC (rev 201414)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-25 Yoav Weiss <yoav@yoav.ws>
+
+ Fix ResourceTiming XHR flakiness
+ https://bugs.webkit.org/show_bug.cgi?id=158019
+
+ Reviewed by Alex Christensen.
+
+ Test fixes and additions that make sure XHR tests are not run as part of XHR's onload event, as ResourceTiming entries are added
+ after it.
+
+ * TestExpectations:
+ * http/tests/performance/performance-resource-timing-cached-entries.html: Avoid running the tests as part of the XHR's load event.
+ * http/tests/performance/performance-resource-timing-xhr-single-entry-expected.txt: Added.
+ * http/tests/performance/performance-resource-timing-xhr-single-entry.html: Test that XHR fetch adds a single entry with correct initiatorType.
+
</ins><span class="cx"> 2016-05-25 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> [JSC] RegExp with deeply nested subexpressions overflow the stack in Yarr
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (201413 => 201414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-05-26 05:31:43 UTC (rev 201413)
+++ trunk/LayoutTests/TestExpectations 2016-05-26 05:33:58 UTC (rev 201414)
</span><span class="lines">@@ -978,8 +978,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/156631 fast/text/font-face-javascript.html [ Pass Crash Failure ]
</span><span class="cx">
</span><del>-webkit.org/b/157816 http/tests/performance/performance-resource-timing-cached-entries.html [ Pass Failure ]
-
</del><span class="cx"> webkit.org/b/157849 fast/frames/crash-during-iframe-load-stop.html [ Pass Timeout ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/158085 http/tests/css/shared-stylesheet-mutation.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsperformanceperformanceresourcetimingcachedentrieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries.html (201413 => 201414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries.html 2016-05-26 05:31:43 UTC (rev 201413)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries.html 2016-05-26 05:33:58 UTC (rev 201414)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> var xhr = new XMLHttpRequest();
</span><span class="cx"> xhr.addEventListener("load", function() {
</span><span class="cx"> if (windowLoaded)
</span><del>- runTest();
</del><ins>+ setTimeout(runTest, 0);
</ins><span class="cx"> xhrLoaded = true;
</span><span class="cx"> });
</span><span class="cx"> xhr.open("GET", "../../resources/square100.png");
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsperformanceperformanceresourcetimingxhrsingleentryexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry-expected.txt (0 => 201414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry-expected.txt 2016-05-26 05:33:58 UTC (rev 201414)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS foundResource is 1
+PASS initiator is "xmlhttprequest"
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsperformanceperformanceresourcetimingxhrsingleentryhtmlfromrev201413trunkLayoutTestshttptestsperformanceperformanceresourcetimingcachedentrieshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry.html (from rev 201413, trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries.html) (0 => 201414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry.html (rev 0)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry.html 2016-05-26 05:33:58 UTC (rev 201414)
</span><span class="lines">@@ -0,0 +1,38 @@
</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>
+<script>
+ var foundResource = 0;
+ 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) {
+ ++foundResource;
+ initiator = resources[i].initiatorType;
+ }
+ };
+ shouldBe("foundResource", "1");
+ shouldBeEqualToString("initiator", "xmlhttprequest");
+ if (window.internals)
+ window.internals.setResourceTimingSupport(false);
+ if (window.testRunner)
+ testRunner.notifyDone();
+ };
+ var xhr = new XMLHttpRequest();
+ xhr.addEventListener("load", function() {
+ setTimeout(runTest, 0);
+ });
+ xhr.open("GET", "../../resources/square100.png");
+ xhr.send();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201413 => 201414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-26 05:31:43 UTC (rev 201413)
+++ trunk/Source/WebCore/ChangeLog 2016-05-26 05:33:58 UTC (rev 201414)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-25 Yoav Weiss <yoav@yoav.ws>
+
+ Fix ResourceTiming XHR flakiness
+ https://bugs.webkit.org/show_bug.cgi?id=158019
+
+ Reviewed by Alex Christensen.
+
+ Remove XHR specific ResourceTiming information store and addition as it is not needed.
+
+ Test: http/tests/performance/performance-resource-timing-xhr-single-entry.html
+
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::loadRequest): Removed XHR-specific initiator info storage.
+ (WebCore::DocumentThreadableLoader::didFinishLoading): Removed XHR-specific RT entry addition.
+ * loader/DocumentThreadableLoader.h:
+
</ins><span class="cx"> 2016-05-25 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [cmake] Deduplicate make-js-file-arrays usage and make it work on Windows.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (201413 => 201414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-05-26 05:31:43 UTC (rev 201413)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-05-26 05:33:58 UTC (rev 201414)
</span><span class="lines">@@ -325,11 +325,6 @@
</span><span class="cx">
</span><span class="cx"> void DocumentThreadableLoader::didFinishLoading(unsigned long identifier, double finishTime)
</span><span class="cx"> {
</span><del>-#if ENABLE(WEB_TIMING)
- if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
- m_resourceTimingInfo.addResourceTiming(m_resource.get(), &m_document);
-#endif
-
</del><span class="cx"> if (m_actualRequest) {
</span><span class="cx"> InspectorInstrumentation::didFinishLoading(m_document.frame(), m_document.frame()->loader().documentLoader(), identifier, finishTime);
</span><span class="cx">
</span><span class="lines">@@ -395,15 +390,9 @@
</span><span class="cx"> newRequest.setInitiator(m_options.initiator);
</span><span class="cx"> ASSERT(!m_resource);
</span><span class="cx"> m_resource = m_document.cachedResourceLoader().requestRawResource(newRequest);
</span><del>- if (m_resource) {
</del><ins>+ if (m_resource)
</ins><span class="cx"> m_resource->addClient(this);
</span><span class="cx">
</span><del>-#if ENABLE(WEB_TIMING)
- if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
- m_resourceTimingInfo.storeResourceTimingInitiatorInformation(m_resource, newRequest, m_document.frame());
-#endif
- }
-
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.h (201413 => 201414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-05-26 05:31:43 UTC (rev 201413)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-05-26 05:33:58 UTC (rev 201414)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CachedRawResourceClient.h"
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><del>-#include "ResourceTimingInformation.h"
</del><span class="cx"> #include "ThreadableLoader.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -106,9 +105,6 @@
</span><span class="cx"> ThreadableLoaderClient* m_client;
</span><span class="cx"> Document& m_document;
</span><span class="cx"> ThreadableLoaderOptions m_options;
</span><del>-#if ENABLE(WEB_TIMING)
- ResourceTimingInformation m_resourceTimingInfo;
-#endif
</del><span class="cx"> bool m_sameOriginRequest;
</span><span class="cx"> bool m_simpleRequest;
</span><span class="cx"> bool m_async;
</span></span></pre>
</div>
</div>
</body>
</html>