Changeset 171574 in webkit

Timestamp:

Jul 24, 2014 6:31:40 PM (10 years ago)

Author:

mitz@apple.com

Message:

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.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebBackForwardListItem.cpp (modified) (2 diffs)
• WebKit2/Shared/WebBackForwardListItem.h (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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&).
+
 2014-07-24  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1060 +1060 @@
 __ZN7WebCore31CrossOriginPreflightResultCache5emptyEv
 __ZN7WebCore31CrossOriginPreflightResultCache6sharedEv
+__ZN7WebCore31equalIgnoringFragmentIdentifierERKNS_3URLES2_
 __ZN7WebCore33deleteAllCookiesModifiedAfterDateERKNS_21NetworkStorageSessionEd
 __ZN7WebCore33stripLeadingAndTrailingHTMLSpacesERKN3WTF6StringE

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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.
+
 2014-07-24  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp

@@ -27 +27 @@
 #include "WebBackForwardListItem.h"
 
+#include <WebCore/URL.h>
+
 namespace WebKit {
 
@@ -48 +50 @@
 }
 
+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);
+}
+
 uint64_t WebBackForwardListItem::highedUsedItemID()
 {

trunk/Source/WebKit2/Shared/WebBackForwardListItem.h

@@ -58 +58 @@
     const String& title() const { return m_itemState.pageState.title; }
 
+    bool itemIsInSameDocument(const WebBackForwardListItem&) const;
+
 #if PLATFORM(COCOA)
     ViewSnapshot* snapshot() const { return m_itemState.snapshot.get(); }

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -901 +901 @@
         return reattachToWebProcessWithItem(forwardItem);
 
-    uint64_t navigationID = generateNavigationID();
+    uint64_t navigationID = m_backForwardList->currentItem()->itemIsInSameDocument(*forwardItem) ? 0 : generateNavigationID();
 
     m_process->send(Messages::WebPage::GoForward(navigationID, forwardItem->itemID()), m_pageID);
@@ -922 +922 @@
         return reattachToWebProcessWithItem(backItem);
 
-    uint64_t navigationID = generateNavigationID();
+    uint64_t navigationID = m_backForwardList->currentItem()->itemIsInSameDocument(*backItem) ? 0 : generateNavigationID();
 
     m_process->send(Messages::WebPage::GoBack(navigationID, backItem->itemID()), m_pageID);
@@ -939 +939 @@
     m_pageLoadState.setPendingAPIRequestURL(transaction, item->url());
 
-    uint64_t navigationID = generateNavigationID();
+    uint64_t navigationID = m_backForwardList->currentItem()->itemIsInSameDocument(*item) ? 0 : generateNavigationID();
 
     m_process->send(Messages::WebPage::GoToBackForwardItem(navigationID, item->itemID()), m_pageID);