Skip to content
Permalink
Browse files
[WK2] Do not suppress navigation snapshotting on session restore if w…
…e are not navigating right away

https://bugs.webkit.org/show_bug.cgi?id=159216
<rdar://problem/27058360>

Reviewed by Andreas Kling.

Do not suppress navigation snapshotting on session restore if we are not navigating
right away. The snapshot we already have may be outdated by the time we actually
navigate (e.g. Because the user scrolled) so we don't want to suppress snapshotting
in this case.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::restoreFromSessionState):


Canonical link: https://commits.webkit.org/177321@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202574 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
cdumez committed Jun 28, 2016
1 parent d6e02da commit 674dfde83456ba342942b1197a0ed31fc11c5568
Showing with 21 additions and 3 deletions.
  1. +16 −0 Source/WebKit2/ChangeLog
  2. +5 −3 Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -1,3 +1,19 @@
2016-06-28 Chris Dumez <cdumez@apple.com>

[WK2] Do not suppress navigation snapshotting on session restore if we are not navigating right away
https://bugs.webkit.org/show_bug.cgi?id=159216
<rdar://problem/27058360>

Reviewed by Andreas Kling.

Do not suppress navigation snapshotting on session restore if we are not navigating
right away. The snapshot we already have may be outdated by the time we actually
navigate (e.g. Because the user scrolled) so we don't want to suppress snapshotting
in this case.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::restoreFromSessionState):

2016-06-27 Anders Carlsson <andersca@apple.com>

WebKit::WebPaymentCoordinator leak
@@ -2317,9 +2317,11 @@ RefPtr<API::Navigation> WebPageProxy::restoreFromSessionState(SessionState sessi

process().send(Messages::WebPage::RestoreSession(m_backForwardList->itemStates()), m_pageID);

// The back / forward list was restored from a sessionState so we don't want to snapshot the current
// page when navigating away. Suppress navigation snapshotting until the next load has committed.
m_suppressNavigationSnapshotting = true;
if (navigate) {
// The back / forward list was restored from a sessionState so we don't want to snapshot the current
// page when navigating away. Suppress navigation snapshotting until the next load has committed
m_suppressNavigationSnapshotting = true;
}
}

// FIXME: Navigating should be separate from state restoration.

0 comments on commit 674dfde

Please sign in to comment.