Changeset 156924 in webkit for trunk/Source/WebCore/page/Page.cpp

Timestamp:

Oct 4, 2013, 4:25:55 PM (12 years ago)

Author:

[email protected]

Message:

../WebCore: Unify rubberband control
​https://bugs.webkit.org/show_bug.cgi?id=122341

Reviewed by Tim Horton.

• Consolidates the two ways we were passing state about whether to rubber-band on a particular edge down to one.

• WebCore.exp.in:
• page/Page.cpp:
• page/Page.h:
• page/scrolling/ScrollingCoordinator.h:

(WebCore::ScrollingCoordinator::isRubberBandInProgress):

• page/scrolling/ScrollingTree.cpp:

(WebCore::ScrollingTree::ScrollingTree):
(WebCore::ScrollingTree::setCanRubberBandState):
(WebCore::ScrollingTree::rubberBandsAtLeft):
(WebCore::ScrollingTree::rubberBandsAtRight):
(WebCore::ScrollingTree::rubberBandsAtBottom):
(WebCore::ScrollingTree::rubberBandsAtTop):
(WebCore::ScrollingTree::willWheelEventStartSwipeGesture):

• page/scrolling/ScrollingTree.h:
• page/scrolling/mac/ScrollingCoordinatorMac.h:
• page/scrolling/mac/ScrollingCoordinatorMac.mm:
• page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:

(WebCore::ScrollingTreeScrollingNodeMac::shouldRubberBandInDirection):

../WebKit2: Unify rubber-band control
​https://bugs.webkit.org/show_bug.cgi?id=122341

Reviewed by Tim Horton.

• Consolidates the two ways we were passing state about whether to rubber-band on a particular edge down to one.
• Adds SPI to control whether you can rubber band on the left or right edge.
• Add a linked-on-or-after check to control whether we use the legacy implicit rubber band control based on back/forward.

• UIProcess/API/C/WKPage.cpp:

(WKPageRubberBandsAtLeft):
(WKPageSetRubberBandsAtLeft):
(WKPageRubberBandsAtRight):
(WKPageSetRubberBandsAtRight):
(WKPageRubberBandsAtBottom):
(WKPageSetRubberBandsAtBottom):

• UIProcess/API/C/WKPage.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::sendWheelEvent):
(WebKit::WebPageProxy::rubberBandsAtLeft):
(WebKit::WebPageProxy::setRubberBandsAtLeft):
(WebKit::WebPageProxy::rubberBandsAtRight):
(WebKit::WebPageProxy::setRubberBandsAtRight):
(WebKit::WebPageProxy::rubberBandsAtTop):
(WebKit::WebPageProxy::setRubberBandsAtTop):
(WebKit::WebPageProxy::rubberBandsAtBottom):
(WebKit::WebPageProxy::setRubberBandsAtBottom):

• UIProcess/WebPageProxy.h:
• UIProcess/mac/WebPageProxyMac.mm:

(WebKit::shouldUseLegacyImplicitRubberBandControl):
(WebKit::WebPageProxy::platformInitialize):

• WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::wheelEvent):

• WebProcess/WebPage/EventDispatcher.h:
• WebProcess/WebPage/EventDispatcher.messages.in:
• WebProcess/WebPage/WebPage.cpp:
• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/WebPage.messages.in:

File:

• trunk/Source/WebCore/page/Page.cpp (modified) (1 diff)

trunk/Source/WebCore/page/Page.cpp

@@ -838 +838 @@
 }
 
-bool Page::rubberBandsAtBottom()
-{
-    if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
-        return scrollingCoordinator->rubberBandsAtBottom();
-
-    return false;
-}
-
-void Page::setRubberBandsAtBottom(bool rubberBandsAtBottom)
-{
-    if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
-        scrollingCoordinator->setRubberBandsAtBottom(rubberBandsAtBottom);
-}
-
-bool Page::rubberBandsAtTop()
-{
-    if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
-        return scrollingCoordinator->rubberBandsAtTop();
-
-    return false;
-}
-
-void Page::setRubberBandsAtTop(bool rubberBandsAtTop)
-{
-    if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
-        scrollingCoordinator->setRubberBandsAtTop(rubberBandsAtTop);
-}
-
 void Page::setPagination(const Pagination& pagination)
 {