Changeset 160742 in webkit

Timestamp:

Dec 17, 2013 6:00:45 PM (10 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:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/scrolling/ScrollingTree.cpp (modified) (1 diff)
• WebCore/page/scrolling/ScrollingTree.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/EventDispatcher.cpp (modified) (3 diffs)
• WebKit2/WebProcess/WebPage/EventDispatcher.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/EventDispatcher.messages.in (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-17  Simon Fraser  <simon.fraser@apple.com>
+
+        Rename "canRubberBands" to "canRubberBand"
+        https://bugs.webkit.org/show_bug.cgi?id=125897
+
+        Reviewed by Anders Carlsson.
+
+        Rename "canRubberBands" to "canRubberBand" in various places.
+
+        * page/scrolling/ScrollingTree.cpp:
+        (WebCore::ScrollingTree::setCanRubberBandState):
+        * page/scrolling/ScrollingTree.h:
+
 2013-12-17  Jer Noble  <jer.noble@apple.com>
 

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

@@ -279 +279 @@
 }
 
-void ScrollingTree::setCanRubberBandState(bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom)
+void ScrollingTree::setCanRubberBandState(bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
 {
     MutexLocker locker(m_swipeStateMutex);
 
-    m_rubberBandsAtLeft = canRubberBandsAtLeft;
-    m_rubberBandsAtRight = canRubberBandsAtRight;
-    m_rubberBandsAtTop = canRubberBandsAtTop;
-    m_rubberBandsAtBottom = canRubberBandsAtBottom;
+    m_rubberBandsAtLeft = canRubberBandAtLeft;
+    m_rubberBandsAtRight = canRubberBandAtRight;
+    m_rubberBandsAtTop = canRubberBandAtTop;
+    m_rubberBandsAtBottom = canRubberBandAtBottom;
 }
 

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

@@ -93 +93 @@
 
     // Can be called from any thread. Will update what edges allow rubber-banding.
-    void setCanRubberBandState(bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom);
+    void setCanRubberBandState(bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom);
 
     bool rubberBandsAtLeft();

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-17  Simon Fraser  <simon.fraser@apple.com>
+
+        Rename "canRubberBands" to "canRubberBand"
+        https://bugs.webkit.org/show_bug.cgi?id=125897
+
+        Reviewed by Anders Carlsson.
+
+        Rename "canRubberBands" to "canRubberBand" in various places.
+
+        * WebProcess/WebPage/EventDispatcher.cpp:
+        (WebKit::EventDispatcher::wheelEvent):
+        * WebProcess/WebPage/EventDispatcher.h:
+        * WebProcess/WebPage/EventDispatcher.messages.in:
+
 2013-12-17  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -85 +85 @@
 }
 
-void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom)
+void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
 {
 #if ENABLE(THREADED_SCROLLING)
@@ -97 +97 @@
         // We only need to do this at the beginning of the gesture.
         if (platformWheelEvent.phase() == PlatformWheelEventPhaseBegan)
-            ScrollingThread::dispatch(bind(&ScrollingTree::setCanRubberBandState, scrollingTree, canRubberBandsAtLeft, canRubberBandsAtRight, canRubberBandsAtTop, canRubberBandsAtBottom));
+            ScrollingThread::dispatch(bind(&ScrollingTree::setCanRubberBandState, scrollingTree, canRubberBandAtLeft, canRubberBandAtRight, canRubberBandAtTop, canRubberBandAtBottom));
 
         ScrollingTree::EventResult result = scrollingTree->tryToHandleWheelEvent(platformWheelEvent);
@@ -106 +106 @@
     }
 #else
-    UNUSED_PARAM(canRubberBandsAtLeft);
-    UNUSED_PARAM(canRubberBandsAtRight);
-    UNUSED_PARAM(canRubberBandsAtTop);
-    UNUSED_PARAM(canRubberBandsAtBottom);
+    UNUSED_PARAM(canRubberBandAtLeft);
+    UNUSED_PARAM(canRubberBandAtRight);
+    UNUSED_PARAM(canRubberBandAtTop);
+    UNUSED_PARAM(canRubberBandAtBottom);
 #endif
 

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

@@ -62 +62 @@
 
     // Message handlers
-    void wheelEvent(uint64_t pageID, const WebWheelEvent&, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom);
+    void wheelEvent(uint64_t pageID, const WebWheelEvent&, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom);
 
     // This is called on the main thread.

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

@@ -22 +22 @@
 
 messages -> EventDispatcher {
-    WheelEvent(uint64_t pageID, WebKit::WebWheelEvent event, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom)
+    WheelEvent(uint64_t pageID, WebKit::WebWheelEvent event, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
 }