<!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>[169059] branches/safari-538.34.5-branch</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/169059">169059</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-19 13:09:32 -0700 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/169016">r169016</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari538345branchSourceWebKit2ChangeLog">branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessCocoaNavigationStateh">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.h</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessCocoaNavigationStatemm">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcesscfWebPageProxyCFcpp">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2WebProcessWebPageWebPagemessagesin">branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#branchessafari538345branchToolsChangeLog">branches/safari-538.34.5-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari538345branchToolsMiniBrowsermacMiniBrowser_Prefixpch">branches/safari-538.34.5-branch/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch</a></li>
<li><a href="#branchessafari538345branchToolsMiniBrowsermacWK2BrowserWindowControllerm">branches/safari-538.34.5-branch/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari538345branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -1,5 +1,74 @@
</span><span class="cx"> 2014-05-19 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r169016
+
+ 2014-05-18 Anders Carlsson <andersca@apple.com>
+
+ Implement Navigations for all methods declared returning one
+ https://bugs.webkit.org/show_bug.cgi?id=133048
+ <rdar://problem/16830064>
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView goToBackForwardListItem:]):
+ (-[WKWebView goBack]):
+ (-[WKWebView goForward]):
+ (-[WKWebView reload]):
+ (-[WKWebView reloadFromOrigin]):
+ Create and return navigations.
+
+ (-[WKWebView _reload]):
+ Call -[WKWebView reload].
+
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::createBackForwardNavigation):
+ Create a back/forward navigation.
+
+ (WebKit::NavigationState::createReloadNavigation):
+ Create a reload navigation.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::reattachToWebProcessWithItem):
+ Generate a navigation ID and send it with the GoToBackForwardItem message.
+
+ (WebKit::WebPageProxy::reload):
+ Return a navigation ID.
+
+ (WebKit::WebPageProxy::goForward):
+ Generate a navigation ID and send it with the GoForward message.
+
+ (WebKit::WebPageProxy::goBack):
+ Generate a navigation ID and send it with the GoBack message.
+
+ (WebKit::WebPageProxy::goToBackForwardItem):
+ Generate a navigation ID and send it with the GoToBackForwardItem message.
+
+ * UIProcess/WebPageProxy.h:
+ Return navigation IDs where appropriate.
+
+ * UIProcess/cf/WebPageProxyCF.cpp:
+ (WebKit::WebPageProxy::restoreFromSessionStateData):
+ Generate a navigation ID and send it with the RestoreSessionAndNavigateToCurrentItem message.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::goForward):
+ (WebKit::WebPage::goBack):
+ (WebKit::WebPage::goToBackForwardItem):
+ Set up the pending navigation ID.
+
+ (WebKit::WebPage::restoreSessionAndNavigateToCurrentItem):
+ Call goToBackForwardItem with a navigation ID.
+
+ * WebProcess/WebPage/WebPage.h:
+ Add navigation IDs.
+
+ * WebProcess/WebPage/WebPage.messages.in:
+ Add navigation IDs.
+
+2014-05-19 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r169000
</span><span class="cx">
</span><span class="cx"> 2014-05-17 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -284,10 +284,11 @@
</span><span class="cx">
</span><span class="cx"> - (WKNavigation *)goToBackForwardListItem:(WKBackForwardListItem *)item
</span><span class="cx"> {
</span><del>- _page->goToBackForwardItem(&item._item);
</del><ins>+ uint64_t navigationID = _page->goToBackForwardItem(&item._item);
</ins><span class="cx">
</span><del>- // FIXME: return a WKNavigation object.
- return nil;
</del><ins>+ auto navigation = _navigationState->createBackForwardNavigation(navigationID, item._item);
+
+ return [navigation.leakRef() autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)title
</span><span class="lines">@@ -329,34 +330,44 @@
</span><span class="cx">
</span><span class="cx"> - (WKNavigation *)goBack
</span><span class="cx"> {
</span><del>- _page->goBack();
</del><ins>+ uint64_t navigationID = _page->goBack();
+ if (!navigationID)
+ return nil;
</ins><span class="cx">
</span><del>- // FIXME: Return a navigation object.
- return nil;
</del><ins>+ ASSERT(_page->backForwardList().currentItem());
+ auto navigation = _navigationState->createBackForwardNavigation(navigationID, *_page->backForwardList().currentItem());
+
+ return [navigation.leakRef() autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKNavigation *)goForward
</span><span class="cx"> {
</span><del>- _page->goForward();
</del><ins>+ uint64_t navigationID = _page->goForward();
+ if (!navigationID)
+ return nil;
</ins><span class="cx">
</span><del>- // FIXME: Return a navigation object.
- return nil;
</del><ins>+ ASSERT(_page->backForwardList().currentItem());
+ auto navigation = _navigationState->createBackForwardNavigation(navigationID, *_page->backForwardList().currentItem());
+
+ return [navigation.leakRef() autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKNavigation *)reload
</span><span class="cx"> {
</span><del>- _page->reload(false);
</del><ins>+ uint64_t navigationID = _page->reload(false);
+ ASSERT(navigationID);
</ins><span class="cx">
</span><del>- // FIXME: Return a navigation object.
- return nil;
</del><ins>+ auto navigation = _navigationState->createReloadNavigation(navigationID);
+ return [navigation.leakRef() autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKNavigation *)reloadFromOrigin
</span><span class="cx"> {
</span><del>- _page->reload(true);
</del><ins>+ uint64_t navigationID = _page->reload(true);
+ ASSERT(navigationID);
</ins><span class="cx">
</span><del>- // FIXME: Return a navigation object.
- return nil;
</del><ins>+ auto navigation = _navigationState->createReloadNavigation(navigationID);
+ return [navigation.leakRef() autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)stopLoading
</span><span class="lines">@@ -1072,10 +1083,7 @@
</span><span class="cx">
</span><span class="cx"> - (WKNavigation *)_reload
</span><span class="cx"> {
</span><del>- _page->reload(false);
-
- // FIXME: return a WKNavigation object.
- return nil;
</del><ins>+ return [self reload];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSArray *)_certificateChain
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -63,7 +63,9 @@
</span><span class="cx"> RetainPtr<id <WKHistoryDelegatePrivate> > historyDelegate();
</span><span class="cx"> void setHistoryDelegate(id <WKHistoryDelegatePrivate>);
</span><span class="cx">
</span><ins>+ RetainPtr<WKNavigation> createBackForwardNavigation(uint64_t navigationID, const WebBackForwardListItem&);
</ins><span class="cx"> RetainPtr<WKNavigation> createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *);
</span><ins>+ RetainPtr<WKNavigation> createReloadNavigation(uint64_t navigationID);
</ins><span class="cx">
</span><span class="cx"> // Called by the history client.
</span><span class="cx"> void didNavigateWithNavigationData(const WebKit::WebNavigationDataStore&);
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -163,6 +163,30 @@
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RetainPtr<WKNavigation> NavigationState::createBackForwardNavigation(uint64_t navigationID, const WebBackForwardListItem& item)
+{
+ ASSERT(!m_navigations.contains(navigationID));
+
+ auto navigation = adoptNS([[WKNavigation alloc] init]);
+
+ // FIXME: We need to remove the navigation when we're done with it!
+ m_navigations.set(navigationID, navigation);
+
+ return navigation;
+}
+
+RetainPtr<WKNavigation> NavigationState::createReloadNavigation(uint64_t navigationID)
+{
+ ASSERT(!m_navigations.contains(navigationID));
+
+ auto navigation = adoptNS([[WKNavigation alloc] init]);
+
+ // FIXME: We need to remove the navigation when we're done with it!
+ m_navigations.set(navigationID, navigation);
+
+ return navigation;
+}
+
</ins><span class="cx"> void NavigationState::didNavigateWithNavigationData(const WebKit::WebNavigationDataStore& navigationDataStore)
</span><span class="cx"> {
</span><span class="cx"> if (!m_historyDelegateMethods.webViewDidNavigateWithNavigationData)
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> m_drawingArea->waitForBackingStoreUpdateOnNextPaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::reattachToWebProcessWithItem(WebBackForwardListItem* item)
</del><ins>+uint64_t WebPageProxy::reattachToWebProcessWithItem(WebBackForwardListItem* item)
</ins><span class="cx"> {
</span><span class="cx"> if (item && item != m_backForwardList->currentItem())
</span><span class="cx"> m_backForwardList->goToItem(item);
</span><span class="lines">@@ -561,10 +561,14 @@
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><span class="cx"> if (!item)
</span><del>- return;
</del><ins>+ return 0;
</ins><span class="cx">
</span><del>- m_process->send(Messages::WebPage::GoToBackForwardItem(item->itemID()), m_pageID);
</del><ins>+ uint64_t navigationID = generateNavigationID();
+
+ m_process->send(Messages::WebPage::GoToBackForwardItem(navigationID, item->itemID()), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><ins>+
+ return navigationID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setSession(API::Session& session)
</span><span class="lines">@@ -795,7 +799,7 @@
</span><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::reload(bool reloadFromOrigin)
</del><ins>+uint64_t WebPageProxy::reload(bool reloadFromOrigin)
</ins><span class="cx"> {
</span><span class="cx"> SandboxExtension::Handle sandboxExtensionHandle;
</span><span class="cx">
</span><span class="lines">@@ -810,13 +814,15 @@
</span><span class="cx"> m_process->willAcquireUniversalFileReadSandboxExtension();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!isValid()) {
- reattachToWebProcessWithItem(m_backForwardList->currentItem());
- return;
- }
</del><ins>+ if (!isValid())
+ return reattachToWebProcessWithItem(m_backForwardList->currentItem());
</ins><span class="cx">
</span><del>- m_process->send(Messages::WebPage::Reload(generateNavigationID(), reloadFromOrigin, sandboxExtensionHandle), m_pageID);
</del><ins>+ uint64_t navigationID = generateNavigationID();
+
+ m_process->send(Messages::WebPage::Reload(navigationID, reloadFromOrigin, sandboxExtensionHandle), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><ins>+
+ return navigationID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::recordNavigationSnapshot()
</span><span class="lines">@@ -829,11 +835,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::goForward()
</del><ins>+uint64_t WebPageProxy::goForward()
</ins><span class="cx"> {
</span><span class="cx"> WebBackForwardListItem* forwardItem = m_backForwardList->forwardItem();
</span><span class="cx"> if (!forwardItem)
</span><del>- return;
</del><ins>+ return 0;
</ins><span class="cx">
</span><span class="cx"> recordNavigationSnapshot();
</span><span class="cx">
</span><span class="lines">@@ -841,20 +847,22 @@
</span><span class="cx">
</span><span class="cx"> m_pageLoadState.setPendingAPIRequestURL(transaction, forwardItem->url());
</span><span class="cx">
</span><del>- if (!isValid()) {
- reattachToWebProcessWithItem(forwardItem);
- return;
- }
</del><ins>+ if (!isValid())
+ return reattachToWebProcessWithItem(forwardItem);
</ins><span class="cx">
</span><del>- m_process->send(Messages::WebPage::GoForward(forwardItem->itemID()), m_pageID);
</del><ins>+ uint64_t navigationID = generateNavigationID();
+
+ m_process->send(Messages::WebPage::GoForward(navigationID, forwardItem->itemID()), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><ins>+
+ return navigationID;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::goBack()
</del><ins>+uint64_t WebPageProxy::goBack()
</ins><span class="cx"> {
</span><span class="cx"> WebBackForwardListItem* backItem = m_backForwardList->backItem();
</span><span class="cx"> if (!backItem)
</span><del>- return;
</del><ins>+ return 0;
</ins><span class="cx">
</span><span class="cx"> recordNavigationSnapshot();
</span><span class="cx">
</span><span class="lines">@@ -862,21 +870,21 @@
</span><span class="cx">
</span><span class="cx"> m_pageLoadState.setPendingAPIRequestURL(transaction, backItem->url());
</span><span class="cx">
</span><del>- if (!isValid()) {
- reattachToWebProcessWithItem(backItem);
- return;
- }
</del><ins>+ if (!isValid())
+ return reattachToWebProcessWithItem(backItem);
</ins><span class="cx">
</span><del>- m_process->send(Messages::WebPage::GoBack(backItem->itemID()), m_pageID);
</del><ins>+ uint64_t navigationID = generateNavigationID();
+
+ m_process->send(Messages::WebPage::GoBack(navigationID, backItem->itemID()), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><ins>+
+ return navigationID;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::goToBackForwardItem(WebBackForwardListItem* item)
</del><ins>+uint64_t WebPageProxy::goToBackForwardItem(WebBackForwardListItem* item)
</ins><span class="cx"> {
</span><del>- if (!isValid()) {
- reattachToWebProcessWithItem(item);
- return;
- }
</del><ins>+ if (!isValid())
+ return reattachToWebProcessWithItem(item);
</ins><span class="cx">
</span><span class="cx"> recordNavigationSnapshot();
</span><span class="cx">
</span><span class="lines">@@ -884,8 +892,12 @@
</span><span class="cx">
</span><span class="cx"> m_pageLoadState.setPendingAPIRequestURL(transaction, item->url());
</span><span class="cx">
</span><del>- m_process->send(Messages::WebPage::GoToBackForwardItem(item->itemID()), m_pageID);
</del><ins>+ uint64_t navigationID = generateNavigationID();
+
+ m_process->send(Messages::WebPage::GoToBackForwardItem(navigationID, item->itemID()), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><ins>+
+ return navigationID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::tryRestoreScrollPosition()
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/WebPageProxy.h (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -517,12 +517,12 @@
</span><span class="cx"> void loadWebArchiveData(API::Data*, API::Object* userData = nullptr);
</span><span class="cx">
</span><span class="cx"> void stopLoading();
</span><del>- void reload(bool reloadFromOrigin);
</del><ins>+ uint64_t reload(bool reloadFromOrigin);
</ins><span class="cx">
</span><del>- void goForward();
- void goBack();
</del><ins>+ uint64_t goForward();
+ uint64_t goBack();
</ins><span class="cx">
</span><del>- void goToBackForwardItem(WebBackForwardListItem*);
</del><ins>+ uint64_t 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, IPC::MessageDecoder&);
</span><span class="lines">@@ -1202,7 +1202,7 @@
</span><span class="cx"> void setCanShortCircuitHorizontalWheelEvents(bool canShortCircuitHorizontalWheelEvents) { m_canShortCircuitHorizontalWheelEvents = canShortCircuitHorizontalWheelEvents; }
</span><span class="cx">
</span><span class="cx"> void reattachToWebProcess();
</span><del>- void reattachToWebProcessWithItem(WebBackForwardListItem*);
</del><ins>+ uint64_t 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="branchessafari538345branchSourceWebKit2UIProcesscfWebPageProxyCFcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> if (WebBackForwardListItem* item = m_backForwardList->currentItem())
</span><span class="cx"> m_pageLoadState.setPendingAPIRequestURL(transaction, item->url());
</span><span class="cx">
</span><del>- process().send(Messages::WebPage::RestoreSessionAndNavigateToCurrentItem(state), m_pageID);
</del><ins>+ process().send(Messages::WebPage::RestoreSessionAndNavigateToCurrentItem(generateNavigationID(), state), m_pageID);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -1078,7 +1078,7 @@
</span><span class="cx"> corePage()->userInputBridge().reloadFrame(m_mainFrame->coreFrame(), reloadFromOrigin);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::goForward(uint64_t backForwardItemID)
</del><ins>+void WebPage::goForward(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">@@ -1087,10 +1087,14 @@
</span><span class="cx"> if (!item)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ ASSERT(!m_pendingNavigationID);
+ if (!item->isInPageCache())
+ m_pendingNavigationID = navigationID;
+
</ins><span class="cx"> m_page->goToItem(item, FrameLoadTypeForward);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::goBack(uint64_t backForwardItemID)
</del><ins>+void WebPage::goBack(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">@@ -1099,10 +1103,14 @@
</span><span class="cx"> if (!item)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ ASSERT(!m_pendingNavigationID);
+ if (!item->isInPageCache())
+ m_pendingNavigationID = navigationID;
+
</ins><span class="cx"> m_page->goToItem(item, FrameLoadTypeBack);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::goToBackForwardItem(uint64_t backForwardItemID)
</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">@@ -1111,6 +1119,10 @@
</span><span class="cx"> if (!item)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ ASSERT(!m_pendingNavigationID);
+ if (!item->isInPageCache())
+ m_pendingNavigationID = navigationID;
+
</ins><span class="cx"> m_page->goToItem(item, FrameLoadTypeIndexedBackForward);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1954,10 +1966,10 @@
</span><span class="cx"> return currentItemID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::restoreSessionAndNavigateToCurrentItem(const SessionState& sessionState)
</del><ins>+void WebPage::restoreSessionAndNavigateToCurrentItem(uint64_t navigationID, const SessionState& sessionState)
</ins><span class="cx"> {
</span><span class="cx"> if (uint64_t currentItemID = restoreSession(sessionState))
</span><del>- goToBackForwardItem(currentItemID);
</del><ins>+ goToBackForwardItem(navigationID, currentItemID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -855,9 +855,9 @@
</span><span class="cx"> void loadPlainTextString(const String&, IPC::MessageDecoder&);
</span><span class="cx"> void loadWebArchiveData(const IPC::DataReference&, IPC::MessageDecoder&);
</span><span class="cx"> void reload(uint64_t navigationID, bool reloadFromOrigin, const SandboxExtension::Handle&);
</span><del>- void goForward(uint64_t);
- void goBack(uint64_t);
- void goToBackForwardItem(uint64_t);
</del><ins>+ void goForward(uint64_t navigationID, uint64_t);
+ void goBack(uint64_t navigationID, uint64_t);
+ void goToBackForwardItem(uint64_t navigationID, uint64_t);
</ins><span class="cx"> void tryRestoreScrollPosition();
</span><span class="cx"> void setActive(bool);
</span><span class="cx"> void setFocused(bool);
</span><span class="lines">@@ -890,7 +890,7 @@
</span><span class="cx"> void loadURLInFrame(const String&, uint64_t frameID);
</span><span class="cx">
</span><span class="cx"> uint64_t restoreSession(const SessionState&);
</span><del>- void restoreSessionAndNavigateToCurrentItem(const SessionState&);
</del><ins>+ void restoreSessionAndNavigateToCurrentItem(uint64_t navigationID, const SessionState&);
</ins><span class="cx">
</span><span class="cx"> void didRemoveBackForwardItem(uint64_t);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -104,9 +104,9 @@
</span><span class="cx"> ScrollBy(uint32_t scrollDirection, uint32_t scrollGranularity)
</span><span class="cx"> CenterSelectionInVisibleArea()
</span><span class="cx">
</span><del>- GoBack(uint64_t backForwardItemID)
- GoForward(uint64_t backForwardItemID)
- GoToBackForwardItem(uint64_t backForwardItemID)
</del><ins>+ GoBack(uint64_t navigationID, uint64_t backForwardItemID)
+ GoForward(uint64_t navigationID, uint64_t backForwardItemID)
+ 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 class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> StopLoadingFrame(uint64_t frameID)
</span><span class="cx">
</span><span class="cx"> RestoreSession(WebKit::SessionState state)
</span><del>- RestoreSessionAndNavigateToCurrentItem(WebKit::SessionState state)
</del><ins>+ RestoreSessionAndNavigateToCurrentItem(uint64_t navigationID, WebKit::SessionState state)
</ins><span class="cx">
</span><span class="cx"> DidRemoveBackForwardItem(uint64_t backForwardItemID)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari538345branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Tools/ChangeLog (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Tools/ChangeLog 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Tools/ChangeLog 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-05-19 Lucas Forschler <lforschler@apple.com>
+
+ Merge r169016
+
+ 2014-05-18 Anders Carlsson <andersca@apple.com>
+
+ Implement Navigations for all methods declared returning one
+ https://bugs.webkit.org/show_bug.cgi?id=133048
+ <rdar://problem/16830064>
+
+ Reviewed by Sam Weinig.
+
+ * MiniBrowser/mac/MiniBrowser_Prefix.pch:
+ Import WebKit.h.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController webView:didStartProvisionalNavigation:]):
+ (-[WK2BrowserWindowController webView:didReceiveServerRedirectForProvisionalNavigation:]):
+ (-[WK2BrowserWindowController webView:didFailProvisionalNavigation:withError:]):
+ (-[WK2BrowserWindowController webView:didCommitNavigation:]):
+ (-[WK2BrowserWindowController webView:didFinishLoadingNavigation:]):
+ (-[WK2BrowserWindowController webView:didFailNavigation:withError:]):
+ Print out the navigations.
+
</ins><span class="cx"> 2014-05-16 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168555
</span></span></pre></div>
<a id="branchessafari538345branchToolsMiniBrowsermacMiniBrowser_Prefixpch"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -25,10 +25,9 @@
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #import <Cocoa/Cocoa.h>
</span><ins>+ #import <WebKit/WebKit.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#import <WebKit2/WebKit2_C.h>
-
</del><span class="cx"> #define ENABLE_LOGGING 0
</span><span class="cx">
</span><span class="cx"> #if ENABLE_LOGGING
</span></span></pre></div>
<a id="branchessafari538345branchToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (169058 => 169059)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-05-19 20:08:11 UTC (rev 169058)
+++ branches/safari-538.34.5-branch/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-05-19 20:09:32 UTC (rev 169059)
</span><span class="lines">@@ -411,32 +411,32 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
</span><span class="cx"> {
</span><del>- LOG(@"didStartProvisionalNavigation");
</del><ins>+ LOG(@"didStartProvisionalNavigation: %@", navigation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation *)navigation
</span><span class="cx"> {
</span><del>- LOG(@"didReceiveServerRedirectForProvisionalNavigation");
</del><ins>+ LOG(@"didReceiveServerRedirectForProvisionalNavigation: %@", navigation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
</span><span class="cx"> {
</span><del>- LOG(@"didFailProvisionalNavigation: %@", error);
</del><ins>+ LOG(@"didFailProvisionalNavigation: %@navigation, error: %@", navigation, error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation
</span><span class="cx"> {
</span><del>- LOG(@"didCommitNavigation: %@", error);
</del><ins>+ LOG(@"didCommitNavigation: %@", navigation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView didFinishLoadingNavigation:(WKNavigation *)navigation
</span><span class="cx"> {
</span><del>- LOG(@"didFinishLoadingNavigation");
</del><ins>+ LOG(@"didFinishLoadingNavigation: %@", navigation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error
</span><span class="cx"> {
</span><del>- LOG(@"didFailNavigation: %@", error);
</del><ins>+ LOG(@"didFailNavigation: %@, error %@", navigation, error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>