<!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>[169805] 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/169805">169805</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-06-11 07:30:34 -0700 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/17218629> [Cocoa] WKWebView’s canGoBack and canGoForward properties are not KVO-compliant
https://bugs.webkit.org/show_bug.cgi?id=133722
Reviewed by Anders Carlsson.
* UIProcess/API/Cocoa/WKBrowsingContextController.mm: Added no-op overrides of new
PageLoadStateObserver member functions.
* UIProcess/API/Cocoa/WKWebView.h: Documented the canGoBack and canGoForward properties as
being KVO-compliant.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView canGoBack]): Changed to get the return value from the page load state.
(-[WKWebView canGoForward]): Ditto.
* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::willChangeCanGoBack): Override this new PageLoadStateObserver
member function by sending the appropriate KVO change message to the WKWebView.
(WebKit::NavigationState::didChangeCanGoBack): Ditto.
(WebKit::NavigationState::willChangeCanGoForward): Ditto.
(WebKit::NavigationState::didChangeCanGoForward): Ditto.
* UIProcess/PageLoadState.cpp:
(WebKit::PageLoadState::commitChanges): Check for changes to canGoBack and canGoForward
and call the observers if needed.
(WebKit::PageLoadState::canGoBack): Added. Returns the value from the committed state.
(WebKit::PageLoadState::setCanGoBack): Added. Sets the value in the uncommitted state.
(WebKit::PageLoadState::canGoForward): Added. Returns the value from the committed state.
(WebKit::PageLoadState::setCanGoForward): Added. Sets the value in the uncommitted state.
* UIProcess/PageLoadState.h:
(WebKit::PageLoadState::Data::Data): Added canGoBack and canGoForward boolean members.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didChangeBackForwardList): Update the page load state with the new
state of canGoBack and canGoForward.
* UIProcess/WebPageProxy.h: Removed unused member variables m_canGoBack and m_canGoForward.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.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="#trunkSourceWebKit2UIProcessPageLoadStatecpp">trunk/Source/WebKit2/UIProcess/PageLoadState.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageLoadStateh">trunk/Source/WebKit2/UIProcess/PageLoadState.h</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 (169804 => 169805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-11 12:50:31 UTC (rev 169804)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-11 14:30:34 UTC (rev 169805)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2014-06-11 Dan Bernstein <mitz@apple.com>
+
+ <rdar://problem/17218629> [Cocoa] WKWebView’s canGoBack and canGoForward properties are not KVO-compliant
+ https://bugs.webkit.org/show_bug.cgi?id=133722
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm: Added no-op overrides of new
+ PageLoadStateObserver member functions.
+
+ * UIProcess/API/Cocoa/WKWebView.h: Documented the canGoBack and canGoForward properties as
+ being KVO-compliant.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView canGoBack]): Changed to get the return value from the page load state.
+ (-[WKWebView canGoForward]): Ditto.
+
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::willChangeCanGoBack): Override this new PageLoadStateObserver
+ member function by sending the appropriate KVO change message to the WKWebView.
+ (WebKit::NavigationState::didChangeCanGoBack): Ditto.
+ (WebKit::NavigationState::willChangeCanGoForward): Ditto.
+ (WebKit::NavigationState::didChangeCanGoForward): Ditto.
+
+ * UIProcess/PageLoadState.cpp:
+ (WebKit::PageLoadState::commitChanges): Check for changes to canGoBack and canGoForward
+ and call the observers if needed.
+ (WebKit::PageLoadState::canGoBack): Added. Returns the value from the committed state.
+ (WebKit::PageLoadState::setCanGoBack): Added. Sets the value in the uncommitted state.
+ (WebKit::PageLoadState::canGoForward): Added. Returns the value from the committed state.
+ (WebKit::PageLoadState::setCanGoForward): Added. Sets the value in the uncommitted state.
+ * UIProcess/PageLoadState.h:
+ (WebKit::PageLoadState::Data::Data): Added canGoBack and canGoForward boolean members.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChangeBackForwardList): Update the page load state with the new
+ state of canGoBack and canGoForward.
+ * UIProcess/WebPageProxy.h: Removed unused member variables m_canGoBack and m_canGoForward.
+
</ins><span class="cx"> 2014-06-11 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Avoid Vector copies in WebNotificationManagerProxy::providerDidCloseNotifications(), FindController::findStringMatches()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (169804 => 169805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-06-11 12:50:31 UTC (rev 169804)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-06-11 14:30:34 UTC (rev 169805)
</span><span class="lines">@@ -120,6 +120,11 @@
</span><span class="cx"> [m_controller didChangeValueForKey:@"estimatedProgress"];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ virtual void willChangeCanGoBack() override { }
+ virtual void didChangeCanGoBack() override { }
+ virtual void willChangeCanGoForward() override { }
+ virtual void didChangeCanGoForward() override { }
+
</ins><span class="cx"> WKBrowsingContextController *m_controller;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (169804 => 169805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-06-11 12:50:31 UTC (rev 169804)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-06-11 14:30:34 UTC (rev 169805)
</span><span class="lines">@@ -146,12 +146,16 @@
</span><span class="cx">
</span><span class="cx"> /*! @abstract A Boolean value indicating whether there is a back item in
</span><span class="cx"> the back-forward list that can be navigated to.
</span><ins>+ @discussion @link WKWebView @/link is key-value observing (KVO) compliant
+ for this property.
</ins><span class="cx"> @seealso backForwardList.
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, readonly) BOOL canGoBack;
</span><span class="cx">
</span><span class="cx"> /*! @abstract A Boolean value indicating whether there is a forward item in
</span><span class="cx"> the back-forward list that can be navigated to.
</span><ins>+ @discussion @link WKWebView @/link is key-value observing (KVO) compliant
+ for this property.
</ins><span class="cx"> @seealso backForwardList.
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, readonly) BOOL canGoForward;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169804 => 169805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-11 12:50:31 UTC (rev 169804)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-11 14:30:34 UTC (rev 169805)
</span><span class="lines">@@ -404,16 +404,14 @@
</span><span class="cx"> return _page->pageLoadState().hasOnlySecureContent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: This should be KVO compliant.
</del><span class="cx"> - (BOOL)canGoBack
</span><span class="cx"> {
</span><del>- return !!_page->backForwardList().backItem();
</del><ins>+ return _page->pageLoadState().canGoBack();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: This should be KVO compliant.
</del><span class="cx"> - (BOOL)canGoForward
</span><span class="cx"> {
</span><del>- return !!_page->backForwardList().forwardItem();
</del><ins>+ return _page->pageLoadState().canGoForward();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKNavigation *)goBack
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (169804 => 169805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-06-11 12:50:31 UTC (rev 169804)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-06-11 14:30:34 UTC (rev 169805)
</span><span class="lines">@@ -127,6 +127,10 @@
</span><span class="cx"> virtual void didChangeHasOnlySecureContent() override;
</span><span class="cx"> virtual void willChangeEstimatedProgress() override;
</span><span class="cx"> virtual void didChangeEstimatedProgress() override;
</span><ins>+ virtual void willChangeCanGoBack() override;
+ virtual void didChangeCanGoBack() override;
+ virtual void willChangeCanGoForward() override;
+ virtual void didChangeCanGoForward() override;
</ins><span class="cx">
</span><span class="cx"> WKWebView *m_webView;
</span><span class="cx"> WeakObjCPtr<id <WKNavigationDelegate> > m_navigationDelegate;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (169804 => 169805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-06-11 12:50:31 UTC (rev 169804)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-06-11 14:30:34 UTC (rev 169805)
</span><span class="lines">@@ -732,6 +732,26 @@
</span><span class="cx"> [m_webView didChangeValueForKey:@"estimatedProgress"];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NavigationState::willChangeCanGoBack()
+{
+ [m_webView willChangeValueForKey:@"canGoBack"];
+}
+
+void NavigationState::didChangeCanGoBack()
+{
+ [m_webView didChangeValueForKey:@"canGoBack"];
+}
+
+void NavigationState::willChangeCanGoForward()
+{
+ [m_webView willChangeValueForKey:@"canGoForward"];
+}
+
+void NavigationState::didChangeCanGoForward()
+{
+ [m_webView didChangeValueForKey:@"canGoForward"];
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageLoadStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.cpp (169804 => 169805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2014-06-11 12:50:31 UTC (rev 169804)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2014-06-11 14:30:34 UTC (rev 169805)
</span><span class="lines">@@ -95,12 +95,18 @@
</span><span class="cx">
</span><span class="cx"> m_mayHaveUncommittedChanges = false;
</span><span class="cx">
</span><ins>+ bool canGoBackChanged = m_committedState.canGoBack != m_uncommittedState.canGoBack;
+ bool canGoForwardChanged = m_committedState.canGoForward != m_uncommittedState.canGoForward;
</ins><span class="cx"> bool titleChanged = m_committedState.title != m_uncommittedState.title;
</span><span class="cx"> bool isLoadingChanged = isLoading(m_committedState) != isLoading(m_uncommittedState);
</span><span class="cx"> bool activeURLChanged = activeURL(m_committedState) != activeURL(m_uncommittedState);
</span><span class="cx"> bool hasOnlySecureContentChanged = hasOnlySecureContent(m_committedState) != hasOnlySecureContent(m_uncommittedState);
</span><span class="cx"> bool estimatedProgressChanged = estimatedProgress(m_committedState) != estimatedProgress(m_uncommittedState);
</span><span class="cx">
</span><ins>+ if (canGoBackChanged)
+ callObserverCallback(&Observer::willChangeCanGoBack);
+ if (canGoForwardChanged)
+ callObserverCallback(&Observer::willChangeCanGoForward);
</ins><span class="cx"> if (titleChanged)
</span><span class="cx"> callObserverCallback(&Observer::willChangeTitle);
</span><span class="cx"> if (isLoadingChanged)
</span><span class="lines">@@ -125,6 +131,10 @@
</span><span class="cx"> callObserverCallback(&Observer::didChangeIsLoading);
</span><span class="cx"> if (titleChanged)
</span><span class="cx"> callObserverCallback(&Observer::didChangeTitle);
</span><ins>+ if (canGoForwardChanged)
+ callObserverCallback(&Observer::didChangeCanGoForward);
+ if (canGoBackChanged)
+ callObserverCallback(&Observer::didChangeCanGoBack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageLoadState::reset(const Transaction::Token& token)
</span><span class="lines">@@ -318,6 +328,28 @@
</span><span class="cx"> m_uncommittedState.title = title;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PageLoadState::canGoBack() const
+{
+ return m_committedState.canGoBack;
+}
+
+void PageLoadState::setCanGoBack(const Transaction::Token& token, bool canGoBack)
+{
+ ASSERT_UNUSED(token, &token.m_pageLoadState == this);
+ m_uncommittedState.canGoBack = canGoBack;
+}
+
+bool PageLoadState::canGoForward() const
+{
+ return m_committedState.canGoForward;
+}
+
+void PageLoadState::setCanGoForward(const Transaction::Token& token, bool canGoForward)
+{
+ ASSERT_UNUSED(token, &token.m_pageLoadState == this);
+ m_uncommittedState.canGoForward = canGoForward;
+}
+
</ins><span class="cx"> void PageLoadState::didStartProgress(const Transaction::Token& token)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(token, &token.m_pageLoadState == this);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageLoadStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.h (169804 => 169805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageLoadState.h 2014-06-11 12:50:31 UTC (rev 169804)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.h 2014-06-11 14:30:34 UTC (rev 169805)
</span><span class="lines">@@ -61,6 +61,12 @@
</span><span class="cx">
</span><span class="cx"> virtual void willChangeEstimatedProgress() = 0;
</span><span class="cx"> virtual void didChangeEstimatedProgress() = 0;
</span><ins>+
+ virtual void willChangeCanGoBack() = 0;
+ virtual void didChangeCanGoBack() = 0;
+
+ virtual void willChangeCanGoForward() = 0;
+ virtual void didChangeCanGoForward() = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Transaction {
</span><span class="lines">@@ -134,6 +140,12 @@
</span><span class="cx"> const String& title() const;
</span><span class="cx"> void setTitle(const Transaction::Token&, const String&);
</span><span class="cx">
</span><ins>+ bool canGoBack() const;
+ void setCanGoBack(const Transaction::Token&, bool);
+
+ bool canGoForward() const;
+ void setCanGoForward(const Transaction::Token&, bool);
+
</ins><span class="cx"> void didStartProgress(const Transaction::Token&);
</span><span class="cx"> void didChangeProgress(const Transaction::Token&, double);
</span><span class="cx"> void didFinishProgress(const Transaction::Token&);
</span><span class="lines">@@ -150,6 +162,8 @@
</span><span class="cx"> Data()
</span><span class="cx"> : state(State::Finished)
</span><span class="cx"> , hasInsecureContent(false)
</span><ins>+ , canGoBack(false)
+ , canGoForward(false)
</ins><span class="cx"> , estimatedProgress(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -166,6 +180,9 @@
</span><span class="cx">
</span><span class="cx"> String title;
</span><span class="cx">
</span><ins>+ bool canGoBack;
+ bool canGoForward;
+
</ins><span class="cx"> double estimatedProgress;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (169804 => 169805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-11 12:50:31 UTC (rev 169804)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-11 14:30:34 UTC (rev 169805)
</span><span class="lines">@@ -925,6 +925,11 @@
</span><span class="cx"> {
</span><span class="cx"> m_loaderClient->didChangeBackForwardList(this, added, std::move(removed));
</span><span class="cx">
</span><ins>+ auto transaction = m_pageLoadState.transaction();
+
+ m_pageLoadState.setCanGoBack(transaction, m_backForwardList->backItem());
+ m_pageLoadState.setCanGoForward(transaction, m_backForwardList->forwardItem());
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> m_pageClient.clearCustomSwipeViews();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (169804 => 169805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-11 12:50:31 UTC (rev 169804)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-11 14:30:34 UTC (rev 169805)
</span><span class="lines">@@ -1552,8 +1552,6 @@
</span><span class="cx"> std::unique_ptr<ProcessThrottler::ForegroundActivityToken> m_activityToken;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool m_canGoBack;
- bool m_canGoForward;
</del><span class="cx"> Ref<WebBackForwardList> m_backForwardList;
</span><span class="cx">
</span><span class="cx"> bool m_maintainsInactiveSelection;
</span></span></pre>
</div>
</div>
</body>
</html>