<!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>[170723] 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/170723">170723</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 14:31:23 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>RestoreSession should take a vector of BackForwardListItemStates
https://bugs.webkit.org/show_bug.cgi?id=134558
Reviewed by Tim Horton.
* Scripts/webkit2/messages.py:
(struct_or_class):
(headers_for_type):
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::itemStates):
* UIProcess/WebBackForwardList.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::restoreFromSessionState):
(WebKit::WebPageProxy::creationParameters):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::restoreSession):
(WebKit::WebPage::restoreSessionAndNavigateToCurrentItem): Deleted.
* 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="#trunkSourceWebKit2Scriptswebkit2messagespy">trunk/Source/WebKit2/Scripts/webkit2/messages.py</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParameterscpp">trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListcpp">trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListh">trunk/Source/WebKit2/UIProcess/WebBackForwardList.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</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 (170722 => 170723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-02 21:13:23 UTC (rev 170722)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 21:31:23 UTC (rev 170723)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2014-07-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ RestoreSession should take a vector of BackForwardListItemStates
+ https://bugs.webkit.org/show_bug.cgi?id=134558
+
+ Reviewed by Tim Horton.
+
+ * Scripts/webkit2/messages.py:
+ (struct_or_class):
+ (headers_for_type):
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::itemStates):
+ * UIProcess/WebBackForwardList.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::restoreFromSessionState):
+ (WebKit::WebPageProxy::creationParameters):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::restoreSession):
+ (WebKit::WebPage::restoreSessionAndNavigateToCurrentItem): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
+2014-07-02 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Store the back forward list item id inside BackForwardListItemState
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134557
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2messagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (170722 => 170723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2014-07-02 21:13:23 UTC (rev 170722)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages.py 2014-07-02 21:31:23 UTC (rev 170723)
</span><span class="lines">@@ -193,6 +193,7 @@
</span><span class="cx"> 'WebCore::WindowFeatures',
</span><span class="cx"> 'WebKit::AssistedNodeInformation',
</span><span class="cx"> 'WebKit::AttributedString',
</span><ins>+ 'WebKit::BackForwardListItemState',
</ins><span class="cx"> 'WebKit::ColorSpaceData',
</span><span class="cx"> 'WebKit::ContextMenuState',
</span><span class="cx"> 'WebKit::DatabaseProcessCreationParameters',
</span><span class="lines">@@ -437,6 +438,7 @@
</span><span class="cx"> 'WebCore::TextCheckingRequestData': ['<WebCore/TextChecking.h>'],
</span><span class="cx"> 'WebCore::TextCheckingResult': ['<WebCore/TextCheckerClient.h>'],
</span><span class="cx"> 'WebCore::ViewportAttributes': ['<WebCore/ViewportArguments.h>'],
</span><ins>+ 'WebKit::BackForwardListItemState': ['"SessionState.h"'],
</ins><span class="cx"> 'WebKit::InjectedBundleUserMessageEncoder': [],
</span><span class="cx"> 'WebKit::PageState': ['"SessionState.h"'],
</span><span class="cx"> 'WebKit::WebContextUserMessageEncoder': [],
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (170722 => 170723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-07-02 21:13:23 UTC (rev 170722)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-07-02 21:31:23 UTC (rev 170723)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> encoder << pageLength;
</span><span class="cx"> encoder << gapBetweenPages;
</span><span class="cx"> encoder << userAgent;
</span><del>- encoder << sessionState;
</del><ins>+ encoder << itemStates;
</ins><span class="cx"> encoder << sessionID;
</span><span class="cx"> encoder << highestUsedBackForwardItemID;
</span><span class="cx"> encoder << userContentControllerID;
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.userAgent))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.sessionState))
</del><ins>+ if (!decoder.decode(parameters.itemStates))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.sessionID))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (170722 => 170723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-07-02 21:13:23 UTC (rev 170722)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-07-02 21:31:23 UTC (rev 170723)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DrawingAreaInfo.h"
</span><span class="cx"> #include "LayerTreeContext.h"
</span><del>-#include "LegacySessionState.h"
</del><ins>+#include "SessionState.h"
</ins><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebPageGroupData.h"
</span><span class="cx"> #include "WebPreferencesStore.h"
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> String userAgent;
</span><span class="cx">
</span><del>- LegacySessionState sessionState;
</del><ins>+ Vector<BackForwardListItemState> itemStates;
</ins><span class="cx"> WebCore::SessionID sessionID;
</span><span class="cx"> uint64_t highestUsedBackForwardItemID;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (170722 => 170723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-07-02 21:13:23 UTC (rev 170722)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-07-02 21:31:23 UTC (rev 170723)
</span><span class="lines">@@ -418,4 +418,15 @@
</span><span class="cx"> m_entries = std::move(items);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<BackForwardListItemState> WebBackForwardList::itemStates() const
+{
+ Vector<BackForwardListItemState> itemStates;
+ itemStates.reserveInitialCapacity(m_entries.size());
+
+ for (const auto& entry : m_entries)
+ itemStates.uncheckedAppend(entry->itemState());
+
+ return itemStates;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (170722 => 170723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-07-02 21:13:23 UTC (rev 170722)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-07-02 21:31:23 UTC (rev 170723)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> WebBackForwardListItem* backItem() const;
</span><span class="cx"> WebBackForwardListItem* forwardItem() const;
</span><span class="cx"> WebBackForwardListItem* itemAtIndex(int) const;
</span><del>-
</del><ins>+
</ins><span class="cx"> const BackForwardListItemVector& entries() const { return m_entries; }
</span><span class="cx">
</span><span class="cx"> uint32_t currentIndex() const { return m_currentIndex; }
</span><span class="lines">@@ -75,6 +75,8 @@
</span><span class="cx"> BackForwardListState backForwardListState(const std::function<bool (WebBackForwardListItem&)>&) const;
</span><span class="cx"> void restoreFromState(BackForwardListState);
</span><span class="cx">
</span><ins>+ Vector<BackForwardListItemState> itemStates() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit WebBackForwardList(WebPageProxy&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170722 => 170723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-02 21:13:23 UTC (rev 170722)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-02 21:31:23 UTC (rev 170723)
</span><span class="lines">@@ -1869,11 +1869,11 @@
</span><span class="cx">
</span><span class="cx"> if (hasBackForwardList) {
</span><span class="cx"> m_backForwardList->restoreFromState(std::move(sessionState.backForwardListState));
</span><ins>+
</ins><span class="cx"> for (const auto& entry : m_backForwardList->entries())
</span><span class="cx"> process().registerNewWebBackForwardListItem(entry.get());
</span><span class="cx">
</span><del>- LegacySessionState state(m_backForwardList->entries(), m_backForwardList->currentIndex());
- process().send(Messages::WebPage::RestoreSession(state), m_pageID);
</del><ins>+ process().send(Messages::WebPage::RestoreSession(m_backForwardList->itemStates()), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Navigating should be separate from state restoration.
</span><span class="lines">@@ -4420,7 +4420,7 @@
</span><span class="cx"> parameters.pageLength = m_pageLength;
</span><span class="cx"> parameters.gapBetweenPages = m_gapBetweenPages;
</span><span class="cx"> parameters.userAgent = userAgent();
</span><del>- parameters.sessionState = LegacySessionState(m_backForwardList->entries(), m_backForwardList->currentIndex());
</del><ins>+ parameters.itemStates = m_backForwardList->itemStates();
</ins><span class="cx"> parameters.sessionID = m_session->getID();
</span><span class="cx"> parameters.highestUsedBackForwardItemID = WebBackForwardListItem::highedUsedItemID();
</span><span class="cx"> parameters.userContentControllerID = m_userContentController ? m_userContentController->identifier() : 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (170722 => 170723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-02 21:13:23 UTC (rev 170722)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-02 21:31:23 UTC (rev 170723)
</span><span class="lines">@@ -437,8 +437,8 @@
</span><span class="cx">
</span><span class="cx"> WebBackForwardListProxy::setHighestItemIDFromUIProcess(parameters.highestUsedBackForwardItemID);
</span><span class="cx">
</span><del>- if (!parameters.sessionState.isEmpty())
- restoreSession(parameters.sessionState);
</del><ins>+ if (!parameters.itemStates.isEmpty())
+ restoreSession(parameters.itemStates);
</ins><span class="cx">
</span><span class="cx"> if (parameters.sessionID.isValid())
</span><span class="cx"> setSessionID(parameters.sessionID);
</span><span class="lines">@@ -1957,42 +1957,12 @@
</span><span class="cx"> executeEditingCommand(commandName, String());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t WebPage::restoreSession(const LegacySessionState& sessionState)
</del><ins>+void WebPage::restoreSession(const Vector<BackForwardListItemState>& itemStates)
</ins><span class="cx"> {
</span><del>- const BackForwardListItemVector& list = sessionState.list();
- size_t size = list.size();
- uint64_t currentItemID = 0;
- for (size_t i = 0; i < size; ++i) {
- WebBackForwardListItem* webItem = list[i].get();
-
- PageState pageState;
- pageState.title = webItem->title();
- pageState.mainFrameState.urlString = webItem->url();
- pageState.mainFrameState.originalURLString = webItem->originalURL();
-
- RefPtr<API::Data> backForwardData = webItem->backForwardData();
- if (!decodeLegacySessionHistoryEntryData(backForwardData->bytes(), backForwardData->size(), pageState.mainFrameState)) {
- LOG_ERROR("Failed to decode page state.");
- return 0;
- }
-
- RefPtr<HistoryItem> item = toHistoryItem(pageState);
-
- if (i == sessionState.currentIndex())
- currentItemID = webItem->itemID();
-
- WebBackForwardListProxy::addItemFromUIProcess(list[i]->itemID(), item.release());
- }
- ASSERT(currentItemID);
- return currentItemID;
</del><ins>+ for (const auto& itemState : itemStates)
+ WebBackForwardListProxy::addItemFromUIProcess(itemState.identifier, toHistoryItem(itemState.pageState));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::restoreSessionAndNavigateToCurrentItem(uint64_t navigationID, const LegacySessionState& sessionState)
-{
- if (uint64_t currentItemID = restoreSession(sessionState))
- goToBackForwardItem(navigationID, currentItemID);
-}
-
</del><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> static bool handleTouchEvent(const WebTouchEvent& touchEvent, Page* page)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (170722 => 170723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-07-02 21:13:23 UTC (rev 170722)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-07-02 21:31:23 UTC (rev 170723)
</span><span class="lines">@@ -140,7 +140,6 @@
</span><span class="cx">
</span><span class="cx"> class DrawingArea;
</span><span class="cx"> class InjectedBundleBackForwardList;
</span><del>-class LegacySessionState;
</del><span class="cx"> class NotificationPermissionRequestManager;
</span><span class="cx"> class PageBanner;
</span><span class="cx"> class PageOverlay;
</span><span class="lines">@@ -168,6 +167,7 @@
</span><span class="cx"> class WebWheelEvent;
</span><span class="cx"> struct AssistedNodeInformation;
</span><span class="cx"> struct AttributedString;
</span><ins>+struct BackForwardListItemState;
</ins><span class="cx"> struct EditingRange;
</span><span class="cx"> struct EditorState;
</span><span class="cx"> struct InteractionInformationAtPosition;
</span><span class="lines">@@ -923,9 +923,7 @@
</span><span class="cx">
</span><span class="cx"> void loadURLInFrame(const String&, uint64_t frameID);
</span><span class="cx">
</span><del>- uint64_t restoreSession(const LegacySessionState&);
- void restoreSessionAndNavigateToCurrentItem(uint64_t navigationID, const LegacySessionState&);
-
</del><ins>+ void restoreSession(const Vector<BackForwardListItemState>&);
</ins><span class="cx"> void didRemoveBackForwardItem(uint64_t);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (170722 => 170723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-07-02 21:13:23 UTC (rev 170722)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-07-02 21:31:23 UTC (rev 170723)
</span><span class="lines">@@ -129,8 +129,7 @@
</span><span class="cx">
</span><span class="cx"> StopLoadingFrame(uint64_t frameID)
</span><span class="cx">
</span><del>- RestoreSession(WebKit::LegacySessionState state)
- RestoreSessionAndNavigateToCurrentItem(uint64_t navigationID, WebKit::LegacySessionState state)
</del><ins>+ RestoreSession(Vector<WebKit::BackForwardListItemState> itemStates)
</ins><span class="cx">
</span><span class="cx"> DidRemoveBackForwardItem(uint64_t backForwardItemID)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>