<!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>[181815] trunk/Source/WebKit2</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/181815">181815</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-20 15:45:14 -0700 (Fri, 20 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Allow stale content when restoring the browser's session state
https://bugs.webkit.org/show_bug.cgi?id=142916
<rdar://problem/20243493>
Reviewed by Darin Adler.
Allow stale content when restoring the browser's session state
(restoring all tabs from previous session), e.g.
- Via History > Reopen All windows from previous session on Safari
- Happens on startup for MobileSafari
I have verified that using "Open in tabs" on a bookmarks folder
still does fresh loads (rdar://problem/8131355) as it is not using
the restoreFromSessionState() code path.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::reattachToWebProcessForReload):
(WebKit::WebPageProxy::reattachToWebProcessWithItem):
(WebKit::WebPageProxy::goForward):
(WebKit::WebPageProxy::goBack):
(WebKit::WebPageProxy::goToBackForwardItem):
(WebKit::WebPageProxy::restoreFromSessionState):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::goToBackForwardItem):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181814 => 181815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-20 21:35:17 UTC (rev 181814)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-20 22:45:14 UTC (rev 181815)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-03-20 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Allow stale content when restoring the browser's session state
+ https://bugs.webkit.org/show_bug.cgi?id=142916
+ <rdar://problem/20243493>
+
+ Reviewed by Darin Adler.
+
+ Allow stale content when restoring the browser's session state
+ (restoring all tabs from previous session), e.g.
+ - Via History > Reopen All windows from previous session on Safari
+ - Happens on startup for MobileSafari
+
+ I have verified that using "Open in tabs" on a bookmarks folder
+ still does fresh loads (rdar://problem/8131355) as it is not using
+ the restoreFromSessionState() code path.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::reattachToWebProcessForReload):
+ (WebKit::WebPageProxy::reattachToWebProcessWithItem):
+ (WebKit::WebPageProxy::goForward):
+ (WebKit::WebPageProxy::goBack):
+ (WebKit::WebPageProxy::goToBackForwardItem):
+ (WebKit::WebPageProxy::restoreFromSessionState):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::goToBackForwardItem):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2015-03-20 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> [Immediate Actions] Should re-enable immediate actions for iBooks
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (181814 => 181815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-03-20 21:35:17 UTC (rev 181814)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-03-20 22:45:14 UTC (rev 181815)
</span><span class="lines">@@ -656,13 +656,13 @@
</span><span class="cx"> auto navigation = m_navigationState->createReloadNavigation();
</span><span class="cx">
</span><span class="cx"> // We allow stale content when reloading a WebProcess that's been killed or crashed.
</span><del>- m_process->send(Messages::WebPage::GoToBackForwardItem(navigation->navigationID(), m_backForwardList->currentItem()->itemID(), true /* allowStale */), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::GoToBackForwardItem(navigation->navigationID(), m_backForwardList->currentItem()->itemID()), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx">
</span><span class="cx"> return WTF::move(navigation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<API::Navigation> WebPageProxy::reattachToWebProcessWithItem(WebBackForwardListItem* item, AllowStaleContent allowStaleContent)
</del><ins>+RefPtr<API::Navigation> WebPageProxy::reattachToWebProcessWithItem(WebBackForwardListItem* item)
</ins><span class="cx"> {
</span><span class="cx"> if (m_isClosed)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -678,7 +678,7 @@
</span><span class="cx">
</span><span class="cx"> auto navigation = m_navigationState->createBackForwardNavigation();
</span><span class="cx">
</span><del>- m_process->send(Messages::WebPage::GoToBackForwardItem(navigation->navigationID(), item->itemID(), allowStaleContent == AllowStaleContent::Yes), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::GoToBackForwardItem(navigation->navigationID(), item->itemID()), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx">
</span><span class="cx"> return WTF::move(navigation);
</span><span class="lines">@@ -1026,7 +1026,7 @@
</span><span class="cx"> m_pageLoadState.setPendingAPIRequestURL(transaction, forwardItem->url());
</span><span class="cx">
</span><span class="cx"> if (!isValid())
</span><del>- return reattachToWebProcessWithItem(forwardItem, AllowStaleContent::Yes);
</del><ins>+ return reattachToWebProcessWithItem(forwardItem);
</ins><span class="cx">
</span><span class="cx"> RefPtr<API::Navigation> navigation;
</span><span class="cx"> if (!m_backForwardList->currentItem()->itemIsInSameDocument(*forwardItem))
</span><span class="lines">@@ -1049,7 +1049,7 @@
</span><span class="cx"> m_pageLoadState.setPendingAPIRequestURL(transaction, backItem->url());
</span><span class="cx">
</span><span class="cx"> if (!isValid())
</span><del>- return reattachToWebProcessWithItem(backItem, AllowStaleContent::Yes);
</del><ins>+ return reattachToWebProcessWithItem(backItem);
</ins><span class="cx">
</span><span class="cx"> RefPtr<API::Navigation> navigation;
</span><span class="cx"> if (!m_backForwardList->currentItem()->itemIsInSameDocument(*backItem))
</span><span class="lines">@@ -1061,10 +1061,10 @@
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<API::Navigation> WebPageProxy::goToBackForwardItem(WebBackForwardListItem* item, AllowStaleContent allowStaleContent)
</del><ins>+RefPtr<API::Navigation> WebPageProxy::goToBackForwardItem(WebBackForwardListItem* item)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span><del>- return reattachToWebProcessWithItem(item, allowStaleContent);
</del><ins>+ return reattachToWebProcessWithItem(item);
</ins><span class="cx">
</span><span class="cx"> auto transaction = m_pageLoadState.transaction();
</span><span class="cx">
</span><span class="lines">@@ -1074,7 +1074,7 @@
</span><span class="cx"> if (!m_backForwardList->currentItem()->itemIsInSameDocument(*item))
</span><span class="cx"> navigation = m_navigationState->createBackForwardNavigation();
</span><span class="cx">
</span><del>- m_process->send(Messages::WebPage::GoToBackForwardItem(navigation ? navigation->navigationID() : 0, item->itemID(), allowStaleContent == AllowStaleContent::Yes), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::GoToBackForwardItem(navigation ? navigation->navigationID() : 0, item->itemID()), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx">
</span><span class="cx"> return navigation;
</span><span class="lines">@@ -2095,10 +2095,8 @@
</span><span class="cx">
</span><span class="cx"> if (hasBackForwardList) {
</span><span class="cx"> // FIXME: Do we have to null check the back forward list item here?
</span><del>- if (WebBackForwardListItem* item = m_backForwardList->currentItem()) {
- // We forbid stale content when restoring the session state and do a fresh load (rdar://problem/8131355).
- return goToBackForwardItem(item, AllowStaleContent::No);
- }
</del><ins>+ if (WebBackForwardListItem* item = m_backForwardList->currentItem())
+ return goToBackForwardItem(item);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (181814 => 181815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-03-20 21:35:17 UTC (rev 181814)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-03-20 22:45:14 UTC (rev 181815)
</span><span class="lines">@@ -358,8 +358,7 @@
</span><span class="cx"> RefPtr<API::Navigation> goForward();
</span><span class="cx"> RefPtr<API::Navigation> goBack();
</span><span class="cx">
</span><del>- enum class AllowStaleContent { No, Yes };
- RefPtr<API::Navigation> goToBackForwardItem(WebBackForwardListItem*, AllowStaleContent = AllowStaleContent::Yes);
</del><ins>+ RefPtr<API::Navigation> goToBackForwardItem(WebBackForwardListItem*);
</ins><span class="cx"> void tryRestoreScrollPosition();
</span><span class="cx"> void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<RefPtr<WebBackForwardListItem>> removed);
</span><span class="cx"> void willGoToBackForwardListItem(uint64_t itemID, const UserData&);
</span><span class="lines">@@ -1163,7 +1162,7 @@
</span><span class="cx">
</span><span class="cx"> void reattachToWebProcess();
</span><span class="cx"> RefPtr<API::Navigation> reattachToWebProcessForReload();
</span><del>- RefPtr<API::Navigation> reattachToWebProcessWithItem(WebBackForwardListItem*, AllowStaleContent);
</del><ins>+ RefPtr<API::Navigation> reattachToWebProcessWithItem(WebBackForwardListItem*);
</ins><span class="cx">
</span><span class="cx"> void requestNotificationPermission(uint64_t notificationID, const String& originString);
</span><span class="cx"> void showNotification(const String& title, const String& body, const String& iconURL, const String& tag, const String& lang, const String& dir, const String& originString, uint64_t notificationID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (181814 => 181815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-03-20 21:35:17 UTC (rev 181814)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-03-20 22:45:14 UTC (rev 181815)
</span><span class="lines">@@ -1161,7 +1161,7 @@
</span><span class="cx"> m_page->goToItem(*item, FrameLoadType::Back);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::goToBackForwardItem(uint64_t navigationID, uint64_t backForwardItemID, bool allowStaleContent)
</del><ins>+void WebPage::goToBackForwardItem(uint64_t navigationID, uint64_t backForwardItemID)
</ins><span class="cx"> {
</span><span class="cx"> SendStopResponsivenessTimer stopper(this);
</span><span class="cx">
</span><span class="lines">@@ -1174,7 +1174,7 @@
</span><span class="cx"> if (!item->isInPageCache())
</span><span class="cx"> m_pendingNavigationID = navigationID;
</span><span class="cx">
</span><del>- m_page->goToItem(*item, allowStaleContent ? FrameLoadType::IndexedBackForward : FrameLoadType::Standard);
</del><ins>+ m_page->goToItem(*item, FrameLoadType::IndexedBackForward);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::tryRestoreScrollPosition()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (181814 => 181815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-03-20 21:35:17 UTC (rev 181814)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-03-20 22:45:14 UTC (rev 181815)
</span><span class="lines">@@ -926,7 +926,7 @@
</span><span class="cx"> void reload(uint64_t navigationID, bool reloadFromOrigin, const SandboxExtension::Handle&);
</span><span class="cx"> void goForward(uint64_t navigationID, uint64_t);
</span><span class="cx"> void goBack(uint64_t navigationID, uint64_t);
</span><del>- void goToBackForwardItem(uint64_t navigationID, uint64_t, bool allowStaleContent);
</del><ins>+ void goToBackForwardItem(uint64_t navigationID, uint64_t);
</ins><span class="cx"> void tryRestoreScrollPosition();
</span><span class="cx"> void setInitialFocus(bool forward, bool isKeyboardEventValid, const WebKeyboardEvent&);
</span><span class="cx"> void setWindowResizerSize(const WebCore::IntSize&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (181814 => 181815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-03-20 21:35:17 UTC (rev 181814)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-03-20 22:45:14 UTC (rev 181815)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> GoBack(uint64_t navigationID, uint64_t backForwardItemID)
</span><span class="cx"> GoForward(uint64_t navigationID, uint64_t backForwardItemID)
</span><del>- GoToBackForwardItem(uint64_t navigationID, uint64_t backForwardItemID, bool allowStaleContent)
</del><ins>+ GoToBackForwardItem(uint64_t navigationID, uint64_t backForwardItemID)
</ins><span class="cx"> TryRestoreScrollPosition()
</span><span class="cx">
</span><span class="cx"> LoadURLInFrame(String url, uint64_t frameID)
</span></span></pre>
</div>
</div>
</body>
</html>