Changeset 162967 in webkit

Timestamp:

Jan 28, 2014 3:04:56 PM (10 years ago)

Author:

andersca@apple.com

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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (2 diffs)
• UIProcess/API/Cocoa/WKBrowsingContextController.mm (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (4 diffs)
• UIProcess/WebPageProxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-28  Anders Carlsson  <andersca@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  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -198 +198 @@
 bool WKPageCanGoForward(WKPageRef pageRef)
 {
-    return toImpl(pageRef)->canGoForward();
+    return toImpl(pageRef)->backForwardList().forwardItem();
 }
 
@@ -208 +208 @@
 bool WKPageCanGoBack(WKPageRef pageRef)
 {
-    return toImpl(pageRef)->canGoBack();
+    return toImpl(pageRef)->backForwardList().backItem();
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

@@ -305 +305 @@
 - (BOOL)canGoForward
 {
-    return _page->canGoForward();
+    return !!_page->backForwardList().forwardItem();
 }
 
@@ -315 +315 @@
 - (BOOL)canGoBack
 {
-    return _page->canGoBack();
+    return !!_page->backForwardList().backItem();
 }
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -769 +769 @@
 void WebPageProxy::goForward()
 {
-    if (isValid() && !canGoForward())
-        return;
-
     WebBackForwardListItem* forwardItem = m_backForwardList->forwardItem();
     if (!forwardItem)
@@ -791 +788 @@
 }
 
-bool WebPageProxy::canGoForward() const
-{
-    return m_backForwardList->forwardItem();
-}
-
 void WebPageProxy::goBack()
 {
-    if (isValid() && !canGoBack())
+    if (isValid())
         return;
 
@@ -818 +810 @@
     m_process->send(Messages::WebPage::GoBack(backItem->itemID()), m_pageID);
     m_process->responsivenessTimer()->start();
-}
-
-bool WebPageProxy::canGoBack() const
-{
-    return m_backForwardList->backItem();
 }
 
@@ -1314 +1301 @@
             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()

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -394 +394 @@
 
     void goForward();
-    bool canGoForward() const;
     void goBack();
-    bool canGoBack() const;
 
     void goToBackForwardItem(WebBackForwardListItem*);