Title: [162967] trunk/Source/WebKit2
- Revision
- 162967
- Author
- ander...@apple.com
- Date
- 2014-01-28 15:04:56 -0800 (Tue, 28 Jan 2014)
Log Message
Remove WebPageProxy::canGoBack and WebPageProxy::canGoForward
https://bugs.webkit.org/show_bug.cgi?id=127803
Reviewed by Andreas Kling.
* UIProcess/API/C/WKPage.cpp:
(WKPageCanGoForward):
(WKPageCanGoBack):
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController canGoForward]):
(-[WKBrowsingContextController canGoBack]):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::goForward):
(WebKit::WebPageProxy::goBack):
(WebKit::WebPageProxy::sendWheelEvent):
* UIProcess/WebPageProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (162966 => 162967)
--- trunk/Source/WebKit2/ChangeLog 2014-01-28 23:02:05 UTC (rev 162966)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-28 23:04:56 UTC (rev 162967)
@@ -1,5 +1,24 @@
2014-01-28 Anders Carlsson <ander...@apple.com>
+ Remove WebPageProxy::canGoBack and WebPageProxy::canGoForward
+ https://bugs.webkit.org/show_bug.cgi?id=127803
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageCanGoForward):
+ (WKPageCanGoBack):
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController canGoForward]):
+ (-[WKBrowsingContextController canGoBack]):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::goForward):
+ (WebKit::WebPageProxy::goBack):
+ (WebKit::WebPageProxy::sendWheelEvent):
+ * UIProcess/WebPageProxy.h:
+
+2014-01-28 Anders Carlsson <ander...@apple.com>
+
API::PolicyClient::decidePolicyForNavigationAction should take a NavigationActionData object
https://bugs.webkit.org/show_bug.cgi?id=127798
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (162966 => 162967)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-28 23:02:05 UTC (rev 162966)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-01-28 23:04:56 UTC (rev 162967)
@@ -197,7 +197,7 @@
bool WKPageCanGoForward(WKPageRef pageRef)
{
- return toImpl(pageRef)->canGoForward();
+ return toImpl(pageRef)->backForwardList().forwardItem();
}
void WKPageGoBack(WKPageRef pageRef)
@@ -207,7 +207,7 @@
bool WKPageCanGoBack(WKPageRef pageRef)
{
- return toImpl(pageRef)->canGoBack();
+ return toImpl(pageRef)->backForwardList().backItem();
}
void WKPageGoToBackForwardListItem(WKPageRef pageRef, WKBackForwardListItemRef itemRef)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (162966 => 162967)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-01-28 23:02:05 UTC (rev 162966)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-01-28 23:04:56 UTC (rev 162967)
@@ -304,7 +304,7 @@
- (BOOL)canGoForward
{
- return _page->canGoForward();
+ return !!_page->backForwardList().forwardItem();
}
- (void)goBack
@@ -314,7 +314,7 @@
- (BOOL)canGoBack
{
- return _page->canGoBack();
+ return !!_page->backForwardList().backItem();
}
- (void)goToBackForwardListItem:(WKBackForwardListItem *)item
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (162966 => 162967)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-28 23:02:05 UTC (rev 162966)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-28 23:04:56 UTC (rev 162967)
@@ -768,9 +768,6 @@
void WebPageProxy::goForward()
{
- if (isValid() && !canGoForward())
- return;
-
WebBackForwardListItem* forwardItem = m_backForwardList->forwardItem();
if (!forwardItem)
return;
@@ -790,14 +787,9 @@
m_process->responsivenessTimer()->start();
}
-bool WebPageProxy::canGoForward() const
-{
- return m_backForwardList->forwardItem();
-}
-
void WebPageProxy::goBack()
{
- if (isValid() && !canGoBack())
+ if (isValid())
return;
WebBackForwardListItem* backItem = m_backForwardList->backItem();
@@ -819,11 +811,6 @@
m_process->responsivenessTimer()->start();
}
-bool WebPageProxy::canGoBack() const
-{
- return m_backForwardList->backItem();
-}
-
void WebPageProxy::goToBackForwardItem(WebBackForwardListItem* item)
{
if (!isValid()) {
@@ -1313,8 +1300,8 @@
Messages::EventDispatcher::WheelEvent(
m_pageID,
event,
- m_useLegacyImplicitRubberBandControl ? !canGoBack() : rubberBandsAtLeft(),
- m_useLegacyImplicitRubberBandControl ? !canGoForward() : rubberBandsAtRight(),
+ m_useLegacyImplicitRubberBandControl ? !m_backForwardList->backItem() : rubberBandsAtLeft(),
+ m_useLegacyImplicitRubberBandControl ? !m_backForwardList->forwardItem() : rubberBandsAtRight(),
rubberBandsAtTop(),
rubberBandsAtBottom()
), 0);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (162966 => 162967)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-28 23:02:05 UTC (rev 162966)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-28 23:04:56 UTC (rev 162967)
@@ -393,9 +393,7 @@
void reload(bool reloadFromOrigin);
void goForward();
- bool canGoForward() const;
void goBack();
- bool canGoBack() const;
void goToBackForwardItem(WebBackForwardListItem*);
void tryRestoreScrollPosition();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
