Attachment 356612 Details for Bug 192404 – Patch

[patch] Patch

bug-192404-20181205093014.patch (text/plain), 2.34 KB, created by Chris Dumez on 2018-12-05 09:30:14 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-12-05 09:30:14 PST

Size: 2.34 KB

patch

obsolete

>Subversion Revision: 238868
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 55dff1c019a85fac4133ba17220afb152054583b..b9faaf2ebe9215d681965bbbeb359b3d7531978f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-12-05  Chris Dumez  <cdumez@apple.com>
>+
>+        Simplify logic inside WebPageProxy::continueNavigationInNewProcess()
>+        https://bugs.webkit.org/show_bug.cgi?id=192404
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Simplify get the item state from the current back/forward list item, instead of
>+        relying on WebBackForwardList::filteredItemStates().
>+
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::continueNavigationInNewProcess):
>+
> 2018-12-04  Chris Dumez  <cdumez@apple.com>
> 
>         Regression(r238817) PSON Page Cache API tests are failing
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 9aa054a7c1ceeec2fa576317df745cf41a3c7594..322b2617be40e094ee622af31fbe31097fb38b0f 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -2696,14 +2696,10 @@ void WebPageProxy::continueNavigationInNewProcess(API::Navigation& navigation, R
>             return;
>         }
> 
>-        if (navigation->lockBackForwardList() == LockBackForwardList::Yes || navigation->lockHistory() == LockHistory::Yes) {
>+        if (m_backForwardList->currentItem() && (navigation->lockBackForwardList() == LockBackForwardList::Yes || navigation->lockHistory() == LockHistory::Yes)) {
>             // If WebCore is supposed to lock the history for this load, then the new process needs to know about the current history item so it can update
>             // it instead of creating a new one.
>-            auto itemStates = m_backForwardList->filteredItemStates([currentItem = m_backForwardList->currentItem()](WebBackForwardListItem& item) {
>-                return &item == currentItem;
>-            });
>-            RELEASE_ASSERT(itemStates.size() == 1);
>-            m_process->send(Messages::WebPage::SetCurrentHistoryItemForReattach(itemStates[0]), m_pageID);
>+            m_process->send(Messages::WebPage::SetCurrentHistoryItemForReattach(m_backForwardList->currentItem()->itemState()), m_pageID);
>         }
> 
>         // FIXME: Work out timing of responding with the last policy delegate, etc

Actions: View | Formatted Diff | Diff

Attachments on bug 192404: 356612 | 356634