<!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>[177283] 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/177283">177283</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-12-15 10:02:46 -0800 (Mon, 15 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>http/tests/misc/webtiming-origins.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=91314
Reviewed by Anders Carlsson.
This test had three subframes, each being an individual test with waitUntilDone/notifyDone.
How crazy was that?
* http/tests/misc/resources/webtiming-cross-origin-and-back1.html: Removed.
* http/tests/misc/resources/webtiming-cross-origin-redirect.php: Removed.
* http/tests/misc/resources/webtiming-no-origin.html: Removed.
* http/tests/misc/webtiming-cross-origin-and-back1-expected.txt: Added.
* http/tests/misc/webtiming-cross-origin-and-back1.html: Copied from LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html.
* http/tests/misc/webtiming-cross-origin-redirect-expected.txt: Added.
* http/tests/misc/webtiming-cross-origin-redirect.php: Copied from LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php.
* http/tests/misc/webtiming-no-origin-expected.txt: Added.
* http/tests/misc/webtiming-no-origin.html: Copied from LayoutTests/http/tests/misc/resources/webtiming-no-origin.html.
* http/tests/misc/webtiming-origins.html: Removed.
* platform/gtk/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:
* platform/wincairo/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwincairoTestExpectations">trunk/LayoutTests/platform/wincairo/TestExpectations</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmiscwebtimingcrossoriginandback1expectedtxt">trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmiscwebtimingcrossoriginandback1html">trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1.html</a></li>
<li><a href="#trunkLayoutTestshttptestsmiscwebtimingcrossoriginredirectexpectedtxt">trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmiscwebtimingcrossoriginredirectphp">trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect.php</a></li>
<li><a href="#trunkLayoutTestshttptestsmiscwebtimingnooriginexpectedtxt">trunk/LayoutTests/http/tests/misc/webtiming-no-origin-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmiscwebtimingnooriginhtml">trunk/LayoutTests/http/tests/misc/webtiming-no-origin.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmiscresourceswebtimingcrossoriginandback1html">trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html</a></li>
<li><a href="#trunkLayoutTestshttptestsmiscresourceswebtimingcrossoriginredirectphp">trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php</a></li>
<li><a href="#trunkLayoutTestshttptestsmiscresourceswebtimingnooriginhtml">trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html</a></li>
<li><a href="#trunkLayoutTestshttptestsmiscwebtimingoriginshtml">trunk/LayoutTests/http/tests/misc/webtiming-origins.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177282 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/ChangeLog 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-12-15 Alexey Proskuryakov <ap@apple.com>
+
+ http/tests/misc/webtiming-origins.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=91314
+
+ Reviewed by Anders Carlsson.
+
+ This test had three subframes, each being an individual test with waitUntilDone/notifyDone.
+ How crazy was that?
+
+ * http/tests/misc/resources/webtiming-cross-origin-and-back1.html: Removed.
+ * http/tests/misc/resources/webtiming-cross-origin-redirect.php: Removed.
+ * http/tests/misc/resources/webtiming-no-origin.html: Removed.
+ * http/tests/misc/webtiming-cross-origin-and-back1-expected.txt: Added.
+ * http/tests/misc/webtiming-cross-origin-and-back1.html: Copied from LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html.
+ * http/tests/misc/webtiming-cross-origin-redirect-expected.txt: Added.
+ * http/tests/misc/webtiming-cross-origin-redirect.php: Copied from LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php.
+ * http/tests/misc/webtiming-no-origin-expected.txt: Added.
+ * http/tests/misc/webtiming-no-origin.html: Copied from LayoutTests/http/tests/misc/resources/webtiming-no-origin.html.
+ * http/tests/misc/webtiming-origins.html: Removed.
+ * platform/gtk/TestExpectations:
+ * platform/mac/TestExpectations:
+ * platform/win/TestExpectations:
+ * platform/wincairo/TestExpectations:
+
</ins><span class="cx"> 2014-12-15 Bartlomiej Gajda <b.gajda@samsung.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Prevent SourceBuffer monitoring algorithm from triggering a HAVE_NOTHING to HAVE_METADATA transition.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmiscresourceswebtimingcrossoriginandback1html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html (177282 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-<html>
-<head>
-<script src="../../js-test-resources/js-test-pre.js"></script>
-<script>
-if (window.testRunner)
- testRunner.waitUntilDone();
-function doRedirect() {
- window.location = "http://127.0.0.1:8000/misc/resources/webtiming-cross-origin-and-back-redirect1.php";
-}
-addEventListener("load", setTimeout(doRedirect, 0));
-</script>
-</head>
-<body>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsmiscresourceswebtimingcrossoriginredirectphp"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php (177282 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-<?php
- // Tests run from 127.0.0.1, so localhost will appear to be a different origin.
- header('Location: http://localhost:8080/misc/resources/webtiming-cross-origin-redirect.html');
- header('HTTP/1.0 302 Found');
-?>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsmiscresourceswebtimingnooriginhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html (177282 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src="../../js-test-resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("Web Timing should report zeros for redirects and unload since there was no preceding page.");
-
-window.performance = window.performance || {};
-var navigation = performance.navigation || {};
-var timing = performance.timing || {};
-
-function performTest() {
- // FIXME: Need a way to synchronize the test so that loadEventEnd is non-zero.
- var shouldBeZeroList = ["loadEventEnd", "redirectStart", "redirectEnd", "secureConnectionStart", "unloadEventStart", "unloadEventEnd"];
-
- var timingProperties = new Array;
- for (var property in timing) {
- timingProperties.push(property);
- }
- timingProperties.sort();
- for (var i = 0; i < timingProperties.length; ++i) {
- if (shouldBeZeroList.indexOf(timingProperties[i]) >= 0)
- shouldBe("timing." + timingProperties[i], "0");
- else
- shouldBeNonZero("timing." + timingProperties[i]);
- }
- shouldBe("navigation.redirectCount", "0");
-
- finishJSTest();
-}
-
-window.addEventListener("load", performTest);
-
-var jsTestIsAsync = true;
-</script>
-<script src="../../js-test-resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsmiscwebtimingcrossoriginandback1expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1-expected.txt (0 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1-expected.txt 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+If the destination and previous page have the same origin, then Web Timing should report unload timing.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS timing.connectEnd is non-zero.
+PASS timing.connectStart is non-zero.
+PASS timing.domComplete is non-zero.
+PASS timing.domContentLoadedEventEnd is non-zero.
+PASS timing.domContentLoadedEventStart is non-zero.
+PASS timing.domInteractive is non-zero.
+PASS timing.domLoading is non-zero.
+PASS timing.domainLookupEnd is non-zero.
+PASS timing.domainLookupStart is non-zero.
+PASS timing.fetchStart is non-zero.
+PASS timing.loadEventEnd is 0
+PASS timing.loadEventStart is non-zero.
+PASS timing.navigationStart is non-zero.
+PASS timing.redirectEnd is 0
+PASS timing.redirectStart is 0
+PASS timing.requestStart is non-zero.
+PASS timing.responseEnd is non-zero.
+PASS timing.responseStart is non-zero.
+PASS timing.secureConnectionStart is 0
+PASS timing.unloadEventEnd is 0
+PASS timing.unloadEventStart is 0
+PASS navigation.redirectCount is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmiscwebtimingcrossoriginandback1htmlfromrev177279trunkLayoutTestshttptestsmiscresourceswebtimingcrossoriginandback1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1.html (from rev 177279, trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-and-back1.html) (0 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1.html (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-and-back1.html 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<html>
+<head>
+<script src="/js-test-resources/js-test-pre.js"></script>
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+function doRedirect() {
+ window.location = "http://127.0.0.1:8000/misc/resources/webtiming-cross-origin-and-back-redirect1.php";
+}
+addEventListener("load", setTimeout(doRedirect, 0));
+</script>
+</head>
+<body>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmiscwebtimingcrossoriginredirectexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect-expected.txt (0 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect-expected.txt 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+Web Timing should zero out redirect stats after a cross-origin redirect.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS timing.connectEnd is non-zero.
+PASS timing.connectStart is non-zero.
+PASS timing.domComplete is non-zero.
+PASS timing.domContentLoadedEventEnd is non-zero.
+PASS timing.domContentLoadedEventStart is non-zero.
+PASS timing.domInteractive is non-zero.
+PASS timing.domLoading is non-zero.
+PASS timing.domainLookupEnd is non-zero.
+PASS timing.domainLookupStart is non-zero.
+PASS timing.fetchStart is non-zero.
+PASS timing.loadEventEnd is 0
+PASS timing.loadEventStart is non-zero.
+PASS timing.navigationStart is non-zero.
+PASS timing.redirectEnd is 0
+PASS timing.redirectStart is 0
+PASS timing.requestStart is non-zero.
+PASS timing.responseEnd is non-zero.
+PASS timing.responseStart is non-zero.
+PASS timing.secureConnectionStart is 0
+PASS timing.unloadEventEnd is 0
+PASS timing.unloadEventStart is 0
+PASS navigation.redirectCount is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmiscwebtimingcrossoriginredirectphpfromrev177279trunkLayoutTestshttptestsmiscresourceswebtimingcrossoriginredirectphp"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect.php (from rev 177279, trunk/LayoutTests/http/tests/misc/resources/webtiming-cross-origin-redirect.php) (0 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect.php (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-cross-origin-redirect.php 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<?php
+ // Tests run from 127.0.0.1, so localhost will appear to be a different origin.
+ header('Location: http://localhost:8080/misc/resources/webtiming-cross-origin-redirect.html');
+ header('HTTP/1.0 302 Found');
+?>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmiscwebtimingnooriginexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/misc/webtiming-no-origin-expected.txt (0 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/webtiming-no-origin-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-no-origin-expected.txt 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+Web Timing should report zeros for redirects and unload since there was no preceding page.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS timing.connectEnd is non-zero.
+PASS timing.connectStart is non-zero.
+PASS timing.domComplete is non-zero.
+PASS timing.domContentLoadedEventEnd is non-zero.
+PASS timing.domContentLoadedEventStart is non-zero.
+PASS timing.domInteractive is non-zero.
+PASS timing.domLoading is non-zero.
+PASS timing.domainLookupEnd is non-zero.
+PASS timing.domainLookupStart is non-zero.
+PASS timing.fetchStart is non-zero.
+PASS timing.loadEventEnd is 0
+PASS timing.loadEventStart is non-zero.
+PASS timing.navigationStart is non-zero.
+PASS timing.redirectEnd is 0
+PASS timing.redirectStart is 0
+PASS timing.requestStart is non-zero.
+PASS timing.responseEnd is non-zero.
+PASS timing.responseStart is non-zero.
+PASS timing.secureConnectionStart is 0
+PASS timing.unloadEventEnd is 0
+PASS timing.unloadEventStart is 0
+PASS navigation.redirectCount is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmiscwebtimingnooriginhtmlfromrev177279trunkLayoutTestshttptestsmiscresourceswebtimingnooriginhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/misc/webtiming-no-origin.html (from rev 177279, trunk/LayoutTests/http/tests/misc/resources/webtiming-no-origin.html) (0 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/webtiming-no-origin.html (rev 0)
+++ trunk/LayoutTests/http/tests/misc/webtiming-no-origin.html 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="/js-test-resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+description("Web Timing should report zeros for redirects and unload since there was no preceding page.");
+
+window.performance = window.performance || {};
+var navigation = performance.navigation || {};
+var timing = performance.timing || {};
+
+function performTest() {
+ // FIXME: Need a way to synchronize the test so that loadEventEnd is non-zero.
+ var shouldBeZeroList = ["loadEventEnd", "redirectStart", "redirectEnd", "secureConnectionStart", "unloadEventStart", "unloadEventEnd"];
+
+ var timingProperties = new Array;
+ for (var property in timing) {
+ timingProperties.push(property);
+ }
+ timingProperties.sort();
+ for (var i = 0; i < timingProperties.length; ++i) {
+ if (shouldBeZeroList.indexOf(timingProperties[i]) >= 0)
+ shouldBe("timing." + timingProperties[i], "0");
+ else
+ shouldBeNonZero("timing." + timingProperties[i]);
+ }
+ shouldBe("navigation.redirectCount", "0");
+
+ finishJSTest();
+}
+
+window.addEventListener("load", performTest);
+
+var jsTestIsAsync = true;
+</script>
+<script src="/js-test-resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmiscwebtimingoriginshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/misc/webtiming-origins.html (177282 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/webtiming-origins.html 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/http/tests/misc/webtiming-origins.html 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpChildFramesAsText();
-}
-</script>
-</head>
-<body>
-<iframe width="640" height="480" src="resources/webtiming-no-origin.html"></iframe>
-<iframe width="640" height="480" src="resources/webtiming-cross-origin-redirect.php"></iframe>
-<iframe width="640" height="480" src="resources/webtiming-cross-origin-and-back1.html"></iframe>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (177282 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -653,8 +653,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/61121 http/tests/appcache/interrupted-update.html [ Failure Pass ]
</span><span class="cx">
</span><del>-webkit.org/b/91314 http/tests/misc/webtiming-origins.html [ Failure Pass ]
-
</del><span class="cx"> webkit.org/b/94119 storage/websql/database-lock-after-reload.html [ Failure Pass ]
</span><span class="cx"> webkit.org/b/132283 storage/websql/read-transactions-running-concurrently.html [ Failure Pass ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (177282 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -905,20 +905,22 @@
</span><span class="cx"> webkit.org/b/132385 compositing/repaint/repaint-on-layer-grouping-change.html [ Pass Failure ]
</span><span class="cx">
</span><span class="cx"> # Mavericks and prior do not support web timing.
</span><del>-[ MountainLion Mavericks ] fast/dom/Window/window-properties-performance.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/Window/web-timing-minimal-performance-now.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/navigation-type-back-forward.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/navigation-type-navigate.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/navigation-type-reload.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/webtiming.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/webtiming-document-open.html [ Skip ]
-[ MountainLion Mavericks ] fast/dom/webtiming-navigate-within-document.html [ Skip ]
-[ MountainLion Mavericks ] http/tests/misc/webtiming-origins.html [ Skip ]
-[ MountainLion Mavericks ] http/tests/misc/webtiming-one-redirect.php [ Skip ]
-[ MountainLion Mavericks ] http/tests/misc/webtiming-slow-load.php [ Skip ]
-[ MountainLion Mavericks ] http/tests/misc/webtiming-ssl.php [ Skip ]
-[ MountainLion Mavericks ] http/tests/misc/webtiming-two-redirects.php [ Skip ]
-[ MountainLion Mavericks ] fast/performance [ Skip ]
</del><ins>+[ MountainLion Mavericks ] fast/dom/navigation-type-back-forward.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/navigation-type-navigate.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/navigation-type-reload.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/webtiming-document-open.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/webtiming-navigate-within-document.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/webtiming.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/Window/web-timing-minimal-performance-now.html [ WontFix ]
+[ MountainLion Mavericks ] fast/dom/Window/window-properties-performance.html [ WontFix ]
+[ MountainLion Mavericks ] fast/performance [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-cross-origin-and-back1.html [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-cross-origin-redirect.php [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-no-origin.html [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-one-redirect.php [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-slow-load.php [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-ssl.php [ WontFix ]
+[ MountainLion Mavericks ] http/tests/misc/webtiming-two-redirects.php [ WontFix ]
</ins><span class="cx">
</span><span class="cx"> # This test, originally written for Chromium, historically was not testing anything on Mac because
</span><span class="cx"> # resizing didn't work. Now the test fails. I believe this bug was never fixed for the Mac port.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (177282 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/platform/win/TestExpectations 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -1177,21 +1177,23 @@
</span><span class="cx"> fast/forms/validation-message-on-textarea.html
</span><span class="cx">
</span><span class="cx"> # Web Timing is not enabled.
</span><ins>+webkit.org/b/42435 fast/dom/Window/web-timing-minimal-performance-now.html [ Timeout Failure ]
</ins><span class="cx"> webkit.org/b/42435 fast/dom/Window/window-properties-performance.html [ Failure ]
</span><del>-webkit.org/b/42435 fast/dom/Window/web-timing-minimal-performance-now.html [ Timeout Failure ]
</del><span class="cx"> webkit.org/b/42435 fast/dom/navigation-type-back-forward.html [ Failure ]
</span><span class="cx"> webkit.org/b/42435 fast/dom/navigation-type-navigate.html [ Failure ]
</span><span class="cx"> webkit.org/b/42435 fast/dom/navigation-type-reload.html [ Failure ]
</span><del>-webkit.org/b/42435 fast/dom/webtiming.html [ Failure ]
</del><span class="cx"> webkit.org/b/42435 fast/dom/webtiming-document-open.html [ Failure ]
</span><span class="cx"> webkit.org/b/42435 fast/dom/webtiming-navigate-within-document.html [ Failure ]
</span><del>-webkit.org/b/42435 http/tests/misc/webtiming-origins.html [ Failure ]
</del><ins>+webkit.org/b/42435 fast/dom/webtiming.html [ Failure ]
+webkit.org/b/42435 fast/performance/ [ Failure ]
+webkit.org/b/42435 http/tests/misc/webtiming-cross-origin-and-back1.html [ Failure ]
+webkit.org/b/42435 http/tests/misc/webtiming-cross-origin-redirect.php [ Failure ]
+webkit.org/b/42435 http/tests/misc/webtiming-no-origin.html [ Failure ]
</ins><span class="cx"> webkit.org/b/42435 http/tests/misc/webtiming-one-redirect.php [ Failure ]
</span><span class="cx"> webkit.org/b/42435 http/tests/misc/webtiming-slow-load.php [ Failure ]
</span><span class="cx"> webkit.org/b/42435 http/tests/misc/webtiming-ssl.php [ Failure ]
</span><span class="cx"> webkit.org/b/42435 http/tests/misc/webtiming-two-redirects.php [ Failure ]
</span><span class="cx"> webkit.org/b/42435 http/tests/w3c/webperf [ Failure ]
</span><del>-webkit.org/b/42435 fast/performance/ [ Failure ]
</del><span class="cx">
</span><span class="cx"> # Content Security Policy 1.1 (ENABLE_CSP_NEXT) is not enabled
</span><span class="cx"> webkit.org/b/85558 http/tests/security/contentSecurityPolicy/1.1 [ Timeout Crash Pass Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwincairoTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (177282 => 177283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wincairo/TestExpectations 2014-12-15 17:59:42 UTC (rev 177282)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2014-12-15 18:02:46 UTC (rev 177283)
</span><span class="lines">@@ -1731,7 +1731,9 @@
</span><span class="cx"> fast/dom/webtiming.html
</span><span class="cx"> fast/dom/webtiming-document-open.html
</span><span class="cx"> fast/dom/webtiming-navigate-within-document.html
</span><del>-http/tests/misc/webtiming-origins.html
</del><ins>+http/tests/misc/webtiming-cross-origin-and-back1.html
+http/tests/misc/webtiming-cross-origin-redirect.php
+http/tests/misc/webtiming-no-origin.html
</ins><span class="cx"> http/tests/misc/webtiming-one-redirect.php
</span><span class="cx"> http/tests/misc/webtiming-slow-load.php
</span><span class="cx"> http/tests/misc/webtiming-ssl.php
</span></span></pre>
</div>
</div>
</body>
</html>