<!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>[180381] branches/safari-600.5-branch/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/180381">180381</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-02-19 21:30:43 -0800 (Thu, 19 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/179936">r179936</a>. &lt;rdar://19812932&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsChangeLog">branches/safari-600.5-branch/LayoutTests/ChangeLog</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsfastperformanceperformancenowcrashonnavigatedwindowexpectedtxt">branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window-expected.txt</a></li>
<li><a href="#branchessafari6005branchLayoutTestsfastperformanceperformancenowcrashonnavigatedwindowhtml">branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window.html</a></li>
<li>branches/safari-600.5-branch/LayoutTests/fast/performance/resources/</li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180380 => 180381)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/ChangeLog        2015-02-20 05:25:30 UTC (rev 180380)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog        2015-02-20 05:30:43 UTC (rev 180381)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-02-19  Dana Burkart  &lt;dburkart@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merged r179936. &lt;rdar://problem/19812932&gt;
+
+    2015-02-11  Sam Weinig  &lt;sam@webkit.org&gt;
+
+            performance.now can crash if accessed from a window that has navigated
+            &lt;rdar://problem/16892506&gt;
+            https://bugs.webkit.org/show_bug.cgi?id=141478
+
+            Reviewed by Alexey Proskuryakov.
+
+            * fast/performance/performance-now-crash-on-navigated-window-expected.txt: Added.
+            * fast/performance/performance-now-crash-on-navigated-window.html: Added.
+            * fast/performance/resources: Added.
+            * fast/performance/resources/initialFrame.html: Added.
+            * fast/performance/resources/secondFrame.html: Added.
+            Add test for calling performance.now() on from a navigated window.
+
+2015-02-19  Dana Burkart  &lt;dburkart@apple.com&gt;
+
</ins><span class="cx">         Merged r179933. &lt;rdar://problem/19812926&gt;
</span><span class="cx"> 
</span><span class="cx">     2015-02-10  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6005branchLayoutTestsfastperformanceperformancenowcrashonnavigatedwindowexpectedtxtfromrev179936trunkLayoutTestsfastperformanceperformancenowcrashonnavigatedwindowexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window-expected.txt (from rev 179936, trunk/LayoutTests/fast/performance/performance-now-crash-on-navigated-window-expected.txt) (0 => 180381)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window-expected.txt                                (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window-expected.txt        2015-02-20 05:30:43 UTC (rev 180381)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests how the performance object works when it's owning window is not fully active due to navigation.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS value is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6005branchLayoutTestsfastperformanceperformancenowcrashonnavigatedwindowhtmlfromrev179936trunkLayoutTestsfastperformanceperformancenowcrashonnavigatedwindowhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window.html (from rev 179936, trunk/LayoutTests/fast/performance/performance-now-crash-on-navigated-window.html) (0 => 180381)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window.html                                (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window.html        2015-02-20 05:30:43 UTC (rev 180381)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script src=&quot;../../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;script&gt;
+    jsTestIsAsync = true;
+    description(&quot;Tests how the performance object works when it's owning window is not fully active due to navigation.&quot;);
+
+    var perfFromInitialFrame;
+
+    // Called by initialFrame.html
+    function initialFrameLoaded()
+    {
+        var otherWindow = document.getElementById(&quot;frame&quot;).contentWindow;
+        perfFromInitialFrame = otherWindow.performance;
+        otherWindow.location.href = &quot;secondFrame.html&quot;;
+    }
+
+    // Called by secondFrame.html
+    function secondFrameLoaded()
+    {
+        // This should not crash.
+        value = perfFromInitialFrame.now();
+        
+        // Note: We return 0 for this because we need the Frame to get correct timing based on the document loader, and it our
+        // usual idiom to return a 'null-ish' value when the window is disconnected. Firefox returns a non-zero value here, but
+        // there doesn't seem to be anything in the spec that says it must.
+        shouldBe('value', '0');
+
+        finishJSTest();
+    }
+&lt;/script&gt;
+&lt;script src=&quot;../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;iframe id=&quot;frame&quot; src=&quot;resources/initialFrame.html&quot;&gt;&lt;/iframe&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre>
</div>
</div>

</body>
</html>