<!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>[195615] branches/safari-601.1.46-branch</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/195615">195615</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-26 13:19:55 -0800 (Tue, 26 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Re-enable synchronous popstate event for safari-601-branch</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastloaderstateobjectspopstateisasynchronousexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/loader/stateobjects/popstate-is-asynchronous-expected.txt</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoredomDocumentcpp">branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloaderFrameLoadercpp">branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloaderHistoryControllercpp">branches/safari-601.1.46-branch/Source/WebCore/loader/HistoryController.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (195614 => 195615)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog        2016-01-26 21:19:12 UTC (rev 195614)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog        2016-01-26 21:19:55 UTC (rev 195615)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-20  Andy Estes  &lt;aestes@apple.com&gt;
+
+        Re-enable synchronous popstate event for safari-601-branch
+        https://bugs.webkit.org/show_bug.cgi?id=153297
+        rdar://problem/24154417
+
+        Reviewed by Brent Fulgham.
+
+        * fast/loader/stateobjects/popstate-is-asynchronous-expected.txt: Updated to expect popstate to be dispatched synchronously.
+
</ins><span class="cx"> 2016-01-25  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r195492. rdar://problem/24001780
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastloaderstateobjectspopstateisasynchronousexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/loader/stateobjects/popstate-is-asynchronous-expected.txt (195614 => 195615)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/loader/stateobjects/popstate-is-asynchronous-expected.txt        2016-01-26 21:19:12 UTC (rev 195614)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/loader/stateobjects/popstate-is-asynchronous-expected.txt        2016-01-26 21:19:55 UTC (rev 195615)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx"> onload fired
</span><span class="cx"> popstate fired
</span><span class="cx"> Setting hash to #foo
</span><del>-Set hash to #foo
</del><span class="cx"> popstate fired
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (195614 => 195615)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog        2016-01-26 21:19:12 UTC (rev 195614)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog        2016-01-26 21:19:55 UTC (rev 195615)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-01-20  Andy Estes  &lt;aestes@apple.com&gt;
+
+        Re-enable synchronous popstate event for safari-601-branch
+        https://bugs.webkit.org/show_bug.cgi?id=153297
+        rdar://problem/24154417
+
+        Reviewed by Brent Fulgham.
+
+        r192369 made the popstate event dispatch asynchronously, which matches what the HTML5 spec says to do.
+        However, due to compatibility regressions, we do not want to include this behavior change in
+        safari-601-branch. This change reverts r192369's changes to Document.cpp, but retains the new tests.
+        This change is intended only for safari-601-branch and its copies. The popstate event should remain
+        asynchronous in trunk.
+
+        Firing popstate synchronously makes both fast/loader/remove-iframe-during-history-navigation-different.
+        Html and fast/loader/remove-iframe-during-history-navigation-same.html crash, because their onpopstate
+        handlers remove frames from the document that will later be accessed by
+        HistoryController::recursiveGoToItem().
+
+        To prevent the crashes, this change does two things:
+        1. Keep a reference to the current frame inside FrameLoader::loadSameDocumentItem(), since calling
+           loadInSameDocument() might otherwise delete it.
+        2. Handle a null frame when iterating a HistoryItem's child frames in
+           HistoryController::recursiveGoToItem(), since calling goToItem() on one frame might cause another
+           frame to be deleted.
+
+        Covered by existing tests. fast/loader/stateobjects/popstate-is-asynchronous-expected.txt was updated
+        to expect popstate to be synchronous.
+
+        * dom/Document.cpp:
+        (WebCore::Document::enqueuePopstateEvent):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadSameDocumentItem):
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::recursiveGoToItem):
+
</ins><span class="cx"> 2016-01-25  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r195477. rdar://problem/24001780
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp (195614 => 195615)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp        2016-01-26 21:19:12 UTC (rev 195614)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp        2016-01-26 21:19:55 UTC (rev 195615)
</span><span class="lines">@@ -5364,7 +5364,7 @@
</span><span class="cx"> 
</span><span class="cx"> void Document::enqueuePopstateEvent(PassRefPtr&lt;SerializedScriptValue&gt; stateObject)
</span><span class="cx"> {
</span><del>-    enqueueWindowEvent(PopStateEvent::create(stateObject, m_domWindow ? m_domWindow-&gt;history() : nullptr));
</del><ins>+    dispatchWindowEvent(PopStateEvent::create(stateObject, m_domWindow ? m_domWindow-&gt;history() : nullptr));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Document::addMediaCanStartListener(MediaCanStartListener* listener)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp (195614 => 195615)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp        2016-01-26 21:19:12 UTC (rev 195614)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/FrameLoader.cpp        2016-01-26 21:19:55 UTC (rev 195615)
</span><span class="lines">@@ -3191,6 +3191,8 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(item.documentSequenceNumber() == history().currentItem()-&gt;documentSequenceNumber());
</span><span class="cx"> 
</span><ins>+    Ref&lt;Frame&gt; protect(m_frame);
+
</ins><span class="cx">     // Save user view state to the current history item here since we don't do a normal load.
</span><span class="cx">     // FIXME: Does form state need to be saved here too?
</span><span class="cx">     history().saveScrollPositionAndViewStateToItem(history().currentItem());
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/HistoryController.cpp (195614 => 195615)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/HistoryController.cpp        2016-01-26 21:19:12 UTC (rev 195614)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/HistoryController.cpp        2016-01-26 21:19:55 UTC (rev 195615)
</span><span class="lines">@@ -761,9 +761,8 @@
</span><span class="cx"> 
</span><span class="cx">         HistoryItem* fromChildItem = fromItem-&gt;childItemWithTarget(childFrameName);
</span><span class="cx">         ASSERT(fromChildItem);
</span><del>-        Frame* childFrame = m_frame.tree().child(childFrameName);
-        ASSERT(childFrame);
-        childFrame-&gt;loader().history().recursiveGoToItem(const_cast&lt;HistoryItem&amp;&gt;(childItem.get()), fromChildItem, type);
</del><ins>+        if (Frame* childFrame = m_frame.tree().child(childFrameName))
+            childFrame-&gt;loader().history().recursiveGoToItem(const_cast&lt;HistoryItem&amp;&gt;(childItem.get()), fromChildItem, type);
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>