Changeset 160742 in webkit


Ignore:
Timestamp:
Dec 17, 2013, 6:00:45 PM (11 years ago)
Author:
Simon Fraser
Message:

Rename "canRubberBands" to "canRubberBand"
​https://bugs.webkit.org/show_bug.cgi?id=125897

Reviewed by Anders Carlsson.

Rename "canRubberBands" to "canRubberBand" in various places.

Source/WebCore:

  • page/scrolling/ScrollingTree.cpp:

(WebCore::ScrollingTree::setCanRubberBandState):

  • page/scrolling/ScrollingTree.h:

Source/WebKit2:

  • WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::wheelEvent):

  • WebProcess/WebPage/EventDispatcher.h:
  • WebProcess/WebPage/EventDispatcher.messages.in:
Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r160739 r160742  
     12013-12-17  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Rename "canRubberBands" to "canRubberBand"
     4        https://bugs.webkit.org/show_bug.cgi?id=125897
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Rename "canRubberBands" to "canRubberBand" in various places.
     9
     10        * page/scrolling/ScrollingTree.cpp:
     11        (WebCore::ScrollingTree::setCanRubberBandState):
     12        * page/scrolling/ScrollingTree.h:
     13
    1142013-12-17  Jer Noble  <jer.noble@apple.com>
    215

  • trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp

    r158893 r160742  
    279279}
    280280
    281 void ScrollingTree::setCanRubberBandState(bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom)
     281void ScrollingTree::setCanRubberBandState(bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
    282282{
    283283    MutexLocker locker(m_swipeStateMutex);
    284284
    285     m_rubberBandsAtLeft = canRubberBandsAtLeft;
    286     m_rubberBandsAtRight = canRubberBandsAtRight;
    287     m_rubberBandsAtTop = canRubberBandsAtTop;
    288     m_rubberBandsAtBottom = canRubberBandsAtBottom;
     285    m_rubberBandsAtLeft = canRubberBandAtLeft;
     286    m_rubberBandsAtRight = canRubberBandAtRight;
     287    m_rubberBandsAtTop = canRubberBandAtTop;
     288    m_rubberBandsAtBottom = canRubberBandAtBottom;
    289289}
    290290

  • trunk/Source/WebCore/page/scrolling/ScrollingTree.h

    r156924 r160742  
    9393
    9494    // Can be called from any thread. Will update what edges allow rubber-banding.
    95     void setCanRubberBandState(bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom);
     95    void setCanRubberBandState(bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom);
    9696
    9797    bool rubberBandsAtLeft();

  • trunk/Source/WebKit2/ChangeLog

    r160740 r160742  
     12013-12-17  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Rename "canRubberBands" to "canRubberBand"
     4        https://bugs.webkit.org/show_bug.cgi?id=125897
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Rename "canRubberBands" to "canRubberBand" in various places.
     9
     10        * WebProcess/WebPage/EventDispatcher.cpp:
     11        (WebKit::EventDispatcher::wheelEvent):
     12        * WebProcess/WebPage/EventDispatcher.h:
     13        * WebProcess/WebPage/EventDispatcher.messages.in:
     14
    1152013-12-17  Tim Horton  <timothy_horton@apple.com>
    216

  • trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp

    r159001 r160742  
    8585}
    8686
    87 void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom)
     87void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
    8888{
    8989#if ENABLE(THREADED_SCROLLING)
    … …  
    9797        // We only need to do this at the beginning of the gesture.
    9898        if (platformWheelEvent.phase() == PlatformWheelEventPhaseBegan)
    99             ScrollingThread::dispatch(bind(&ScrollingTree::setCanRubberBandState, scrollingTree, canRubberBandsAtLeft, canRubberBandsAtRight, canRubberBandsAtTop, canRubberBandsAtBottom));
     99            ScrollingThread::dispatch(bind(&ScrollingTree::setCanRubberBandState, scrollingTree, canRubberBandAtLeft, canRubberBandAtRight, canRubberBandAtTop, canRubberBandAtBottom));
    100100
    101101        ScrollingTree::EventResult result = scrollingTree->tryToHandleWheelEvent(platformWheelEvent);
    … …  
    106106    }
    107107#else
    108     UNUSED_PARAM(canRubberBandsAtLeft);
    109     UNUSED_PARAM(canRubberBandsAtRight);
    110     UNUSED_PARAM(canRubberBandsAtTop);
    111     UNUSED_PARAM(canRubberBandsAtBottom);
     108    UNUSED_PARAM(canRubberBandAtLeft);
     109    UNUSED_PARAM(canRubberBandAtRight);
     110    UNUSED_PARAM(canRubberBandAtTop);
     111    UNUSED_PARAM(canRubberBandAtBottom);
    112112#endif
    113113

  • trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h

    r157319 r160742  
    6262
    6363    // Message handlers
    64     void wheelEvent(uint64_t pageID, const WebWheelEvent&, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom);
     64    void wheelEvent(uint64_t pageID, const WebWheelEvent&, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom);
    6565
    6666    // This is called on the main thread.

  • trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.messages.in

    r157319 r160742  
    2222
    2323messages -> EventDispatcher {
    24     WheelEvent(uint64_t pageID, WebKit::WebWheelEvent event, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom)
     24    WheelEvent(uint64_t pageID, WebKit::WebWheelEvent event, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
    2525}
Note: See TracChangeset for help on using the changeset viewer.