<!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>[164132] 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/164132">164132</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-14 14:09:57 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WKBackForwardListDidChangeNotification
https://bugs.webkit.org/show_bug.cgi?id=128839
Reviewed by Dan Bernstein.
Also, make LoaderClient::didChangeBackForwardList take a Vector of WebBackForwardListItems
instead of a pointer to a Vector of API::Objects.
* Shared/API/Cocoa/WKFoundation.h:
* UIProcess/API/APILoaderClient.h:
(API::LoaderClient::didChangeBackForwardList):
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageLoaderClient):
* UIProcess/API/Cocoa/WKBackForwardList.h:
* UIProcess/API/Cocoa/WKBackForwardList.mm:
* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::LoaderClient::didChangeBackForwardList):
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::addItem):
(WebKit::WebBackForwardList::goToItem):
(WebKit::WebBackForwardList::clear):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didChangeBackForwardList):
* UIProcess/WebPageProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKFoundationh">trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPILoaderClienth">trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStateh">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListcpp">trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-02-14 Anders Carlsson <andersca@apple.com>
+
+ Add WKBackForwardListDidChangeNotification
+ https://bugs.webkit.org/show_bug.cgi?id=128839
+
+ Reviewed by Dan Bernstein.
+
+ Also, make LoaderClient::didChangeBackForwardList take a Vector of WebBackForwardListItems
+ instead of a pointer to a Vector of API::Objects.
+
+ * Shared/API/Cocoa/WKFoundation.h:
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::didChangeBackForwardList):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient):
+ * UIProcess/API/Cocoa/WKBackForwardList.h:
+ * UIProcess/API/Cocoa/WKBackForwardList.mm:
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::LoaderClient::didChangeBackForwardList):
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::addItem):
+ (WebKit::WebBackForwardList::goToItem):
+ (WebKit::WebBackForwardList::clear):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChangeBackForwardList):
+ * UIProcess/WebPageProxy.h:
+
</ins><span class="cx"> 2014-02-12 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Always enable AVKit in WK2
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -35,4 +35,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifdef __cplusplus
+#define WK_EXTERN extern "C" __attribute__((visibility ("default")))
+#else
+#define WK_EXTERN extern __attribute__((visibility ("default")))
+#endif
+
</ins><span class="cx"> #define WK_DESIGNATED_INITIALIZER
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPILoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> virtual void processDidBecomeResponsive(WebKit::WebPageProxy*) { }
</span><span class="cx"> virtual void processDidCrash(WebKit::WebPageProxy*) { }
</span><span class="cx">
</span><del>- virtual void didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<API::Object>>* removedItems) { }
</del><ins>+ virtual void didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<WebKit::WebBackForwardListItem>> removedItems) { }
</ins><span class="cx"> virtual void willGoToBackForwardListItem(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem*, API::Object*) { }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -895,15 +895,21 @@
</span><span class="cx"> m_client.processDidCrash(toAPI(page), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didChangeBackForwardList(WebPageProxy* page, WebBackForwardListItem* addedItem, Vector<RefPtr<API::Object>>* removedItems) override
</del><ins>+ virtual void didChangeBackForwardList(WebPageProxy* page, WebBackForwardListItem* addedItem, Vector<RefPtr<WebBackForwardListItem>> removedItems) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didChangeBackForwardList)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Array> removedItemsArray;
</span><del>- if (removedItems && !removedItems->isEmpty())
- removedItemsArray = API::Array::create(std::move(*removedItems));
</del><ins>+ if (!removedItems.isEmpty()) {
+ Vector<RefPtr<API::Object>> removedItemsVector;
+ removedItemsVector.reserveInitialCapacity(removedItems.size());
+ for (auto& removedItem : removedItems)
+ removedItemsVector.append(std::move(removedItem));
</ins><span class="cx">
</span><ins>+ removedItemsArray = API::Array::create(std::move(removedItemsVector));
+ }
+
</ins><span class="cx"> m_client.didChangeBackForwardList(toAPI(page), toAPI(addedItem), toAPI(removedItemsArray.get()), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -29,6 +29,26 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit2/WKBackForwardListItem.h>
</span><span class="cx">
</span><ins>+/*! Posted when a back-forward list changes. The notification object is the WKBackForwardList
+ that changed. The <code>userInfo</code> dictionary may contain the
+ @link WKBackForwardListAddedItemKey @/link and @link WKBackForwardListRemovedItemsKey @/link
+ keys.
+*/
+WK_EXTERN NSString * const WKBackForwardListDidChangeNotification;
+
+/*! A key in the <code>userInfo</code> dictionary of a
+ @link WKBackForwardListDidChangeNotification @/link, whose value is the
+ @link WKBackForwardListItem @/link that was appended to the list.
+*/
+WK_EXTERN NSString * const WKBackForwardListAddedItemKey;
+
+
+/*! A key in the <code>userInfo</code> dictionary of a
+ @link WKBackForwardListDidChangeNotification @/link, whose value is an NSArray of
+ @link WKBackForwardListItem@/link instances that were removed from the list.
+*/
+WK_EXTERN NSString * const WKBackForwardListRemovedItemsKey;
+
</ins><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKBackForwardList : NSObject
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -31,6 +31,10 @@
</span><span class="cx"> #import "WKBackForwardListItemInternal.h"
</span><span class="cx"> #import "WKNSArray.h"
</span><span class="cx">
</span><ins>+WK_EXPORT NSString * const WKBackForwardListDidChangeNotification = @"WKBackForwardListDidChangeNotification";
+WK_EXPORT NSString * const WKBackForwardListAddedItemKey = @"WKBackForwardListAddedItemKey";
+WK_EXPORT NSString * const WKBackForwardListRemovedItemsKey = @"WKBackForwardListRemovedItemsKey";
+
</ins><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> @implementation WKBackForwardList {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -84,6 +84,7 @@
</span><span class="cx"> virtual void didFinishLoadForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, API::Object*) override;
</span><span class="cx"> virtual void didFailLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, const WebCore::ResourceError&, API::Object*) override;
</span><span class="cx"> virtual void didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones, API::Object*) override;
</span><ins>+ virtual void didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<WebKit::WebBackForwardListItem>> removedItems) override;
</ins><span class="cx">
</span><span class="cx"> NavigationState& m_navigationState;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx">
</span><span class="cx"> #import "NavigationActionData.h"
</span><span class="cx"> #import "PageLoadState.h"
</span><ins>+#import "WKBackForwardListInternal.h"
+#import "WKBackForwardListItemInternal.h"
</ins><span class="cx"> #import "WKFrameInfoInternal.h"
</span><span class="cx"> #import "WKNavigationActionInternal.h"
</span><span class="cx"> #import "WKNavigationDelegatePrivate.h"
</span><span class="lines">@@ -372,6 +374,26 @@
</span><span class="cx"> [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate.get()) _webView:m_navigationState.m_webView renderingProgressDidChange:renderingProgressEvents(layoutMilestones)];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NavigationState::LoaderClient::didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<WebKit::WebBackForwardListItem>> removedItems)
+{
+ auto userInfo = adoptNS([[NSMutableDictionary alloc] init]);
+
+ if (addedItem)
+ [userInfo setObject:wrapper(*addedItem) forKey:WKBackForwardListAddedItemKey];
+
+ if (!removedItems.isEmpty()) {
+ Vector<id> removed;
+ removed.reserveInitialCapacity(removedItems.size());
+
+ for (const auto& removedItem : removedItems)
+ removed.uncheckedAppend(wrapper(*removedItem));
+
+ [userInfo setObject:adoptNS([[NSArray alloc] initWithObjects:removed.data() count:removed.size()]).get() forKey:WKBackForwardListRemovedItemsKey];
+ }
+
+ [[NSNotificationCenter defaultCenter] postNotificationName:WKBackForwardListDidChangeNotification object:wrapper(m_navigationState.m_webView->_page->backForwardList()) userInfo:userInfo.get()];
+}
+
</ins><span class="cx"> void NavigationState::willChangeIsLoading()
</span><span class="cx"> {
</span><span class="cx"> [m_webView willChangeValueForKey:@"loading"];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> if (!m_capacity || !newItem || !m_page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Vector<RefPtr<API::Object>> removedItems;
</del><ins>+ Vector<RefPtr<WebBackForwardListItem>> removedItems;
</ins><span class="cx">
</span><span class="cx"> if (m_hasCurrentIndex) {
</span><span class="cx"> // Toss everything in the forward list.
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> if (m_currentIndex <= m_entries.size())
</span><span class="cx"> m_entries.insert(m_currentIndex, newItem);
</span><span class="cx">
</span><del>- m_page->didChangeBackForwardList(newItem, &removedItems);
</del><ins>+ m_page->didChangeBackForwardList(newItem, std::move(removedItems));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebBackForwardList::goToItem(WebBackForwardListItem* item)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (index < m_entries.size()) {
</span><span class="cx"> m_currentIndex = index;
</span><del>- m_page->didChangeBackForwardList(0, 0);
</del><ins>+ m_page->didChangeBackForwardList(nullptr, { });
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<WebBackForwardListItem> currentItem = this->currentItem();
</span><del>- Vector<RefPtr<API::Object>> removedItems;
</del><ins>+ Vector<RefPtr<WebBackForwardListItem>> removedItems;
</ins><span class="cx">
</span><span class="cx"> if (!currentItem) {
</span><span class="cx"> // We should only ever have no current item if we also have no current item index.
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> m_entries.clear();
</span><span class="cx"> m_hasCurrentIndex = false;
</span><del>- m_page->didChangeBackForwardList(0, &removedItems);
</del><ins>+ m_page->didChangeBackForwardList(nullptr, std::move(removedItems));
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> m_hasCurrentIndex = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->didChangeBackForwardList(0, &removedItems);
</del><ins>+ m_page->didChangeBackForwardList(nullptr, std::move(removedItems));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -855,9 +855,9 @@
</span><span class="cx"> m_process->send(Messages::WebPage::TryRestoreScrollPosition(), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didChangeBackForwardList(WebBackForwardListItem* added, Vector<RefPtr<API::Object>>* removed)
</del><ins>+void WebPageProxy::didChangeBackForwardList(WebBackForwardListItem* added, Vector<RefPtr<WebBackForwardListItem>> removed)
</ins><span class="cx"> {
</span><del>- m_loaderClient->didChangeBackForwardList(this, added, removed);
</del><ins>+ m_loaderClient->didChangeBackForwardList(this, added, std::move(removed));
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> m_pageClient.clearCustomSwipeViews();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (164131 => 164132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-14 21:29:02 UTC (rev 164131)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-14 22:09:57 UTC (rev 164132)
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx">
</span><span class="cx"> void goToBackForwardItem(WebBackForwardListItem*);
</span><span class="cx"> void tryRestoreScrollPosition();
</span><del>- void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<RefPtr<API::Object>>* removedItems);
</del><ins>+ void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<RefPtr<WebBackForwardListItem>> removed);
</ins><span class="cx"> void willGoToBackForwardListItem(uint64_t itemID, IPC::MessageDecoder&);
</span><span class="cx">
</span><span class="cx"> bool willHandleHorizontalScrollEvents() const;
</span></span></pre>
</div>
</div>
</body>
</html>