<!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>[37657] 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/37657">37657</a></dd>
<dt>Author</dt> <dd>pam@chromium.org</dd>
<dt>Date</dt> <dd>2008-10-17 11:07:22 -0700 (Fri, 17 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-10-17  Pamela Greene  &lt;pam@chromium.org&gt;

        Fix potential race by running two passes of test to defer notifyDone.
        See https://bugs.webkit.org/show_bug.cgi?id=21576

        Reviewed by Timothy Hatcher.

        * fast/history/resources/history_reload_window.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasthistoryresourceshistory_reload_windowhtml">trunk/LayoutTests/fast/history/resources/history_reload_window.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (37656 => 37657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2008-10-17 16:51:03 UTC (rev 37656)
+++ trunk/LayoutTests/ChangeLog        2008-10-17 18:07:22 UTC (rev 37657)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2008-10-17  Pamela Greene  &lt;pam@chromium.org&gt;
+
+        Fix potential race by running two passes of test to defer notifyDone.
+        See https://bugs.webkit.org/show_bug.cgi?id=21576
+
+        Reviewed by Timothy Hatcher.
+
+        * fast/history/resources/history_reload_window.html:
+
</ins><span class="cx"> 2008-10-16  Julien Chaffraix  &lt;jchaffraix@pleyo.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rubber-stamped by Alexey Proskuryakov.
</span></span></pre></div>
<a id="trunkLayoutTestsfasthistoryresourceshistory_reload_windowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/history/resources/history_reload_window.html (37656 => 37657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/history/resources/history_reload_window.html        2008-10-17 16:51:03 UTC (rev 37656)
+++ trunk/LayoutTests/fast/history/resources/history_reload_window.html        2008-10-17 18:07:22 UTC (rev 37657)
</span><span class="lines">@@ -4,21 +4,26 @@
</span><span class="cx">         function test() {
</span><span class="cx">             var tempConsole = document.getElementById('console');
</span><span class="cx">             var console = window.opener.document.getElementById('console');
</span><ins>+            // On the first pass, we'll temporarily set the output to
+            // to failure, and then go(0).  On the second pass,
+            // we set the output back to success and close the window.
</ins><span class="cx">             if (window.opener.i == 0) {
</span><span class="cx">                 tempConsole.innerHTML = 'Test Failed';
</span><span class="cx">                 console.innerHTML = tempConsole.innerHTML;
</span><del>-                window.opener.i = window.opener.i + 1;
</del><ins>+                window.opener.i = 1;
</ins><span class="cx">                 history.go(0);
</span><span class="cx">             } else {
</span><span class="cx">                 console.innerHTML = tempConsole.innerHTML;
</span><ins>+                window.opener.i = 2;
</ins><span class="cx">                 window.close();
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function closed()
</span><span class="cx">         {
</span><del>-            if (window.layoutTestController)
-                opener.setTimeout(&quot;layoutTestController.notifyDone()&quot;, 0);
</del><ins>+            if (window.opener.i == 2)
+                if (window.layoutTestController)
+                    opener.setTimeout(&quot;layoutTestController.notifyDone()&quot;, 0);
</ins><span class="cx">         }
</span><span class="cx">         &lt;/script&gt;
</span><span class="cx">     &lt;/head&gt;
</span></span></pre>
</div>
</div>

</body>
</html>