<!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>[169403] 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/169403">169403</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2014-05-27 16:32:21 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Run web timing tests if web timing is enabled.
https://bugs.webkit.org/show_bug.cgi?id=133327
Reviewed by Ryosuke Niwa.
* fast/dom/script-tests/webtiming-document-open.js:
(finishTest):
* fast/dom/script-tests/webtiming-navigate-within-document.js:
(checkTimingNotChanged):
Use for in loop instead of Object.keys because properties are in prototype chain.
* fast/dom/script-tests/webtiming.js:
Use performance.now instead of 0.
* platform/mac/TestExpectations:
Made web timing tests skipped on Mountain Lion and Mavericks.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomscripttestswebtimingdocumentopenjs">trunk/LayoutTests/fast/dom/script-tests/webtiming-document-open.js</a></li>
<li><a href="#trunkLayoutTestsfastdomscripttestswebtimingnavigatewithindocumentjs">trunk/LayoutTests/fast/dom/script-tests/webtiming-navigate-within-document.js</a></li>
<li><a href="#trunkLayoutTestsfastdomscripttestswebtimingjs">trunk/LayoutTests/fast/dom/script-tests/webtiming.js</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169402 => 169403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-27 22:56:09 UTC (rev 169402)
+++ trunk/LayoutTests/ChangeLog 2014-05-27 23:32:21 UTC (rev 169403)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-05-27 Alex Christensen <achristensen@webkit.org>
+
+ Run web timing tests if web timing is enabled.
+ https://bugs.webkit.org/show_bug.cgi?id=133327
+
+ Reviewed by Ryosuke Niwa.
+
+ * fast/dom/script-tests/webtiming-document-open.js:
+ (finishTest):
+ * fast/dom/script-tests/webtiming-navigate-within-document.js:
+ (checkTimingNotChanged):
+ Use for in loop instead of Object.keys because properties are in prototype chain.
+ * fast/dom/script-tests/webtiming.js:
+ Use performance.now instead of 0.
+ * platform/mac/TestExpectations:
+ Made web timing tests skipped on Mountain Lion and Mavericks.
+
</ins><span class="cx"> 2014-05-27 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r169399.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomscripttestswebtimingdocumentopenjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/script-tests/webtiming-document-open.js (169402 => 169403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-tests/webtiming-document-open.js 2014-05-27 22:56:09 UTC (rev 169402)
+++ trunk/LayoutTests/fast/dom/script-tests/webtiming-document-open.js 2014-05-27 23:32:21 UTC (rev 169403)
</span><span class="lines">@@ -28,7 +28,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function finishTest() {
</span><del>- keys = Object.keys(timing).sort();
</del><ins>+ var keys = [];
+ for (var key in timing)
+ keys.push(key);
+ keys.sort();
+
</ins><span class="cx"> for (var i = 0; i < keys.length; ++i) {
</span><span class="cx"> shouldBe("timing." + keys[i], "originalTiming." + keys[i]);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomscripttestswebtimingnavigatewithindocumentjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/script-tests/webtiming-navigate-within-document.js (169402 => 169403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-tests/webtiming-navigate-within-document.js 2014-05-27 22:56:09 UTC (rev 169402)
+++ trunk/LayoutTests/fast/dom/script-tests/webtiming-navigate-within-document.js 2014-05-27 23:32:21 UTC (rev 169403)
</span><span class="lines">@@ -5,7 +5,10 @@
</span><span class="cx">
</span><span class="cx"> function checkTimingNotChanged()
</span><span class="cx"> {
</span><del>- properties = Object.keys(timing).sort();
</del><ins>+ var properties = [];
+ for (var property in timing)
+ properties.push(property);
+ properties.sort();
</ins><span class="cx"> for (var i = 0; i < properties.length; ++i) {
</span><span class="cx"> property = properties[i];
</span><span class="cx"> if (timing[property] === initialTiming[property])
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomscripttestswebtimingjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/script-tests/webtiming.js (169402 => 169403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-tests/webtiming.js 2014-05-27 22:56:09 UTC (rev 169402)
+++ trunk/LayoutTests/fast/dom/script-tests/webtiming.js 2014-05-27 23:32:21 UTC (rev 169403)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> // Get the order of magnitude correct without a chance for flakiness.
</span><span class="cx"> var oneHourMilliseconds = 60 * 60 * 1000;
</span><del>-var currentUTC = 0; // FIXME: Use performance.now() when available.
</del><ins>+var currentUTC = performance.now();
</ins><span class="cx"> var oneHourAgoUTC = currentUTC - oneHourMilliseconds;
</span><span class="cx">
</span><span class="cx"> function sleepFiftyMilliseconds() {
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (169402 => 169403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-05-27 22:56:09 UTC (rev 169402)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-05-27 23:32:21 UTC (rev 169403)
</span><span class="lines">@@ -188,23 +188,9 @@
</span><span class="cx"> # Directory upload is not enabled.
</span><span class="cx"> fast/forms/file/input-file-directory-upload.html
</span><span class="cx">
</span><del>-# Web Timing is not enabled.
-# https://bugs.webkit.org/show_bug.cgi?id=42434
-fast/dom/Window/window-properties-performance.html
-fast/dom/Window/web-timing-minimal-performance-now.html
-fast/dom/navigation-type-back-forward.html
-fast/dom/navigation-type-navigate.html
-fast/dom/navigation-type-reload.html
-fast/dom/webtiming.html
-fast/dom/webtiming-document-open.html
-fast/dom/webtiming-navigate-within-document.html
-http/tests/misc/webtiming-origins.html
-http/tests/misc/webtiming-one-redirect.php
-http/tests/misc/webtiming-slow-load.php
-http/tests/misc/webtiming-ssl.php
-http/tests/misc/webtiming-two-redirects.php
</del><ins>+# Resource Timing is not enabled.
+# https://bugs.webkit.org/show_bug.cgi?id=133321
</ins><span class="cx"> http/tests/w3c/webperf
</span><del>-fast/performance/
</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
</span><span class="lines">@@ -1370,3 +1356,18 @@
</span><span class="cx"> webkit.org/b/132491 [ MountainLion ] http/tests/media/hls/video-controls-live-stream.html [ WontFix ]
</span><span class="cx">
</span><span class="cx"> [ MountainLion Mavericks ] media/media-source [ WontFix ]
</span><ins>+
+# Mavericks and prior do not support web timing.
+[ 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 ] fast/performance [ Skip ]
</ins></span></pre>
</div>
</div>
</body>
</html>