<!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>[171574] trunk/Source</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/171574">171574</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 18:31:40 -0700 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>
Source/WebCore: WebCore part of <rdar://problem/17593701> Assertion failure in WebPage::reload (!m_pendingNavigationID) when reloading after a same-document back navigation
https://bugs.webkit.org/show_bug.cgi?id=135129
Reviewed by Darin Adler.
* WebCore.exp.in: Exported equalIgnoringFragmentIdentifier(const URL&, const URL&).
Source/WebKit2: WebKit2 part of <rdar://problem/17593701> Assertion failure in WebPage::reload (!m_pendingNavigationID) when reloading after a same-document back navigation
https://bugs.webkit.org/show_bug.cgi?id=135129
Reviewed by Darin Adler.
* Shared/WebBackForwardListItem.cpp:
(WebKit::childItemWithDocumentSequenceNumber): New helper function based on
WebCore::HistoryItem::childItemWithDocumentSequenceNumber.
(WebKit::documentTreesAreEqual): New helper function based on
WebCore::HistoryItem::hasSameDocumentTree.
(WebKit::WebBackForwardListItem::itemIsInSameDocument): Added. Based on
WebCore::HistoryItem::shouldDoSameDocumentNavigationTo.
* Shared/WebBackForwardListItem.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::goForward): Don’t assign a new navigation ID if the back-forward
navigation is a same-document navigation.
(WebKit::WebPageProxy::goBack): Ditto.
(WebKit::WebPageProxy::goToBackForwardItem): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBackForwardListItemcpp">trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBackForwardListItemh">trunk/Source/WebKit2/Shared/WebBackForwardListItem.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171573 => 171574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-25 01:18:23 UTC (rev 171573)
+++ trunk/Source/WebCore/ChangeLog 2014-07-25 01:31:40 UTC (rev 171574)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-07-24 Dan Bernstein <mitz@apple.com>
+
+ WebCore part of <rdar://problem/17593701> Assertion failure in WebPage::reload (!m_pendingNavigationID) when reloading after a same-document back navigation
+ https://bugs.webkit.org/show_bug.cgi?id=135129
+
+ Reviewed by Darin Adler.
+
+ * WebCore.exp.in: Exported equalIgnoringFragmentIdentifier(const URL&, const URL&).
+
</ins><span class="cx"> 2014-07-24 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK1] CSS viewport units use the wrong viewport size in WebKit1
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (171573 => 171574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-07-25 01:18:23 UTC (rev 171573)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-07-25 01:31:40 UTC (rev 171574)
</span><span class="lines">@@ -1059,6 +1059,7 @@
</span><span class="cx"> __ZN7WebCore30overrideUserPreferredLanguagesERKN3WTF6VectorINS0_6StringELm0ENS0_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore31CrossOriginPreflightResultCache5emptyEv
</span><span class="cx"> __ZN7WebCore31CrossOriginPreflightResultCache6sharedEv
</span><ins>+__ZN7WebCore31equalIgnoringFragmentIdentifierERKNS_3URLES2_
</ins><span class="cx"> __ZN7WebCore33deleteAllCookiesModifiedAfterDateERKNS_21NetworkStorageSessionEd
</span><span class="cx"> __ZN7WebCore33stripLeadingAndTrailingHTMLSpacesERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore36standardUserAgentWithApplicationNameERKN3WTF6StringES3_
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (171573 => 171574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-25 01:18:23 UTC (rev 171573)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-25 01:31:40 UTC (rev 171574)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-07-24 Dan Bernstein <mitz@apple.com>
+
+ WebKit2 part of <rdar://problem/17593701> Assertion failure in WebPage::reload (!m_pendingNavigationID) when reloading after a same-document back navigation
+ https://bugs.webkit.org/show_bug.cgi?id=135129
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebBackForwardListItem.cpp:
+ (WebKit::childItemWithDocumentSequenceNumber): New helper function based on
+ WebCore::HistoryItem::childItemWithDocumentSequenceNumber.
+ (WebKit::documentTreesAreEqual): New helper function based on
+ WebCore::HistoryItem::hasSameDocumentTree.
+ (WebKit::WebBackForwardListItem::itemIsInSameDocument): Added. Based on
+ WebCore::HistoryItem::shouldDoSameDocumentNavigationTo.
+ * Shared/WebBackForwardListItem.h:
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::goForward): Don’t assign a new navigation ID if the back-forward
+ navigation is a same-document navigation.
+ (WebKit::WebPageProxy::goBack): Ditto.
+ (WebKit::WebPageProxy::goToBackForwardItem): Ditto.
+
</ins><span class="cx"> 2014-07-24 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Sometimes WKWebView is blank after resuming the app, until you scroll
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBackForwardListItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp (171573 => 171574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-07-25 01:18:23 UTC (rev 171573)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-07-25 01:31:40 UTC (rev 171574)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebBackForwardListItem.h"
</span><span class="cx">
</span><ins>+#include <WebCore/URL.h>
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static uint64_t highestUsedItemID = 0;
</span><span class="lines">@@ -47,6 +49,55 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const FrameState* childItemWithDocumentSequenceNumber(const FrameState& frameState, int64_t number)
+{
+ for (const auto& child : frameState.children) {
+ if (child.documentSequenceNumber == number)
+ return &child;
+ }
+
+ return nullptr;
+}
+
+static bool documentTreesAreEqual(const FrameState& a, const FrameState& b)
+{
+ if (a.documentSequenceNumber != b.documentSequenceNumber)
+ return false;
+
+ if (a.children.size() != b.children.size())
+ return false;
+
+ for (const auto& child : a.children) {
+ const FrameState* otherChild = childItemWithDocumentSequenceNumber(b, child.documentSequenceNumber);
+ if (!otherChild || !documentTreesAreEqual(child, *otherChild))
+ return false;
+ }
+
+ return true;
+}
+
+bool WebBackForwardListItem::itemIsInSameDocument(const WebBackForwardListItem& other) const
+{
+ if (m_pageID != other.m_pageID)
+ return false;
+
+ // The following logic must be kept in sync with WebCore::HistoryItem::shouldDoSameDocumentNavigationTo.
+
+ const FrameState& mainFrameState = m_itemState.pageState.mainFrameState;
+ const FrameState& otherMainFrameState = other.m_itemState.pageState.mainFrameState;
+
+ if (mainFrameState.stateObjectData || otherMainFrameState.stateObjectData)
+ return mainFrameState.documentSequenceNumber == otherMainFrameState.documentSequenceNumber;
+
+ WebCore::URL url = WebCore::URL(WebCore::ParsedURLString, mainFrameState.urlString);
+ WebCore::URL otherURL = WebCore::URL(WebCore::ParsedURLString, otherMainFrameState.urlString);
+
+ if ((url.hasFragmentIdentifier() || otherURL.hasFragmentIdentifier()) && equalIgnoringFragmentIdentifier(url, otherURL))
+ return mainFrameState.documentSequenceNumber == otherMainFrameState.documentSequenceNumber;
+
+ return documentTreesAreEqual(mainFrameState, otherMainFrameState);
+}
+
</ins><span class="cx"> uint64_t WebBackForwardListItem::highedUsedItemID()
</span><span class="cx"> {
</span><span class="cx"> return highestUsedItemID;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBackForwardListItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.h (171573 => 171574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-07-25 01:18:23 UTC (rev 171573)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-07-25 01:31:40 UTC (rev 171574)
</span><span class="lines">@@ -57,6 +57,8 @@
</span><span class="cx"> const String& url() const { return m_itemState.pageState.mainFrameState.urlString; }
</span><span class="cx"> const String& title() const { return m_itemState.pageState.title; }
</span><span class="cx">
</span><ins>+ bool itemIsInSameDocument(const WebBackForwardListItem&) const;
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> ViewSnapshot* snapshot() const { return m_itemState.snapshot.get(); }
</span><span class="cx"> void setSnapshot(PassRefPtr<ViewSnapshot> snapshot) { m_itemState.snapshot = snapshot; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (171573 => 171574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-25 01:18:23 UTC (rev 171573)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-25 01:31:40 UTC (rev 171574)
</span><span class="lines">@@ -900,7 +900,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return reattachToWebProcessWithItem(forwardItem);
</span><span class="cx">
</span><del>- uint64_t navigationID = generateNavigationID();
</del><ins>+ uint64_t navigationID = m_backForwardList->currentItem()->itemIsInSameDocument(*forwardItem) ? 0 : generateNavigationID();
</ins><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::GoForward(navigationID, forwardItem->itemID()), m_pageID);
</span><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="lines">@@ -921,7 +921,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return reattachToWebProcessWithItem(backItem);
</span><span class="cx">
</span><del>- uint64_t navigationID = generateNavigationID();
</del><ins>+ uint64_t navigationID = m_backForwardList->currentItem()->itemIsInSameDocument(*backItem) ? 0 : generateNavigationID();
</ins><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::GoBack(navigationID, backItem->itemID()), m_pageID);
</span><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="lines">@@ -938,7 +938,7 @@
</span><span class="cx">
</span><span class="cx"> m_pageLoadState.setPendingAPIRequestURL(transaction, item->url());
</span><span class="cx">
</span><del>- uint64_t navigationID = generateNavigationID();
</del><ins>+ uint64_t navigationID = m_backForwardList->currentItem()->itemIsInSameDocument(*item) ? 0 : generateNavigationID();
</ins><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::GoToBackForwardItem(navigationID, item->itemID()), m_pageID);
</span><span class="cx"> m_process->responsivenessTimer()->start();
</span></span></pre>
</div>
</div>
</body>
</html>