Diff
Modified: trunk/Source/WebCore/ChangeLog (160741 => 160742)
--- trunk/Source/WebCore/ChangeLog 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 02:00:45 UTC (rev 160742)
@@ -1,3 +1,16 @@
+2013-12-17 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
[MSE] Update duration after appending samples, per spec.
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (160741 => 160742)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2013-12-18 02:00:45 UTC (rev 160742)
@@ -278,14 +278,14 @@
m_mainFrameIsRubberBanding = isRubberBanding;
}
-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;
}
bool ScrollingTree::rubberBandsAtLeft()
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (160741 => 160742)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2013-12-18 02:00:45 UTC (rev 160742)
@@ -92,7 +92,7 @@
#endif
// 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();
bool rubberBandsAtRight();
Modified: trunk/Source/WebKit2/ChangeLog (160741 => 160742)
--- trunk/Source/WebKit2/ChangeLog 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-18 02:00:45 UTC (rev 160742)
@@ -1,3 +1,17 @@
+2013-12-17 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
WebKit2 View Gestures: Fix the shadow layer restore-from-overpinched animation
Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (160741 => 160742)
--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2013-12-18 02:00:45 UTC (rev 160742)
@@ -84,7 +84,7 @@
connection->addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), m_queue.get(), this);
}
-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)
MutexLocker locker(m_scrollingTreesMutex);
@@ -96,7 +96,7 @@
// scrolling tree can be notified.
// 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);
if (result == ScrollingTree::DidHandleEvent || result == ScrollingTree::DidNotHandleEvent) {
@@ -105,10 +105,10 @@
}
}
#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
RunLoop::main()->dispatch(bind(&EventDispatcher::dispatchWheelEvent, this, pageID, wheelEvent));
Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h (160741 => 160742)
--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h 2013-12-18 02:00:45 UTC (rev 160742)
@@ -61,7 +61,7 @@
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
// 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.
void dispatchWheelEvent(uint64_t pageID, const WebWheelEvent&);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.messages.in (160741 => 160742)
--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.messages.in 2013-12-18 01:28:02 UTC (rev 160741)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.messages.in 2013-12-18 02:00:45 UTC (rev 160742)
@@ -21,5 +21,5 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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)
}
