- Revision
- 138629
- Author
- [email protected]
- Date
- 2013-01-02 12:16:57 -0800 (Wed, 02 Jan 2013)
Log Message
[chromium] Use top level field for gesture event source
https://bugs.webkit.org/show_bug.cgi?id=105664
Reviewed by Adam Barth.
Previously, only GestureFlingStart subtypes of WebGestureEvent
had a deviceSource flag. A previous CL added a top-level
deviceSource field for all WebGestureEvent. Now that this field
is populated in Chromium, use it as necessary in the Chromium
WebKit layer.
No new tests: covered by existing tests.
* src/WebCompositorInputHandlerImpl.cpp:
(WebKit::WebCompositorInputHandlerImpl::handleGestureFling):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::handleGestureEvent):
* tests/WebCompositorInputHandlerImplTest.cpp:
(WebKit::TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (138628 => 138629)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-02 20:00:47 UTC (rev 138628)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-02 20:16:57 UTC (rev 138629)
@@ -1,3 +1,25 @@
+2013-01-02 Robert Kroeger <[email protected]>
+
+ [chromium] Use top level field for gesture event source
+ https://bugs.webkit.org/show_bug.cgi?id=105664
+
+ Reviewed by Adam Barth.
+
+ Previously, only GestureFlingStart subtypes of WebGestureEvent
+ had a deviceSource flag. A previous CL added a top-level
+ deviceSource field for all WebGestureEvent. Now that this field
+ is populated in Chromium, use it as necessary in the Chromium
+ WebKit layer.
+
+ No new tests: covered by existing tests.
+
+ * src/WebCompositorInputHandlerImpl.cpp:
+ (WebKit::WebCompositorInputHandlerImpl::handleGestureFling):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::handleGestureEvent):
+ * tests/WebCompositorInputHandlerImplTest.cpp:
+ (WebKit::TEST_F):
+
2012-12-28 Fady Samuel <[email protected]>
Roll Chromium DEPS to r174739
Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp (138628 => 138629)
--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2013-01-02 20:00:47 UTC (rev 138628)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2013-01-02 20:16:57 UTC (rev 138629)
@@ -219,15 +219,15 @@
WebInputHandlerClient::ScrollStatus scrollStatus = m_inputHandlerClient->scrollBegin(WebPoint(gestureEvent.x, gestureEvent.y), WebInputHandlerClient::ScrollInputTypeGesture);
switch (scrollStatus) {
case WebInputHandlerClient::ScrollStatusStarted: {
- if (gestureEvent.data.flingStart.sourceDevice == WebGestureEvent::Touchpad)
+ if (gestureEvent.sourceDevice == WebGestureEvent::Touchpad)
m_inputHandlerClient->scrollEnd();
- m_flingCurve = adoptPtr(Platform::current()->createFlingAnimationCurve(gestureEvent.data.flingStart.sourceDevice, WebFloatPoint(gestureEvent.data.flingStart.velocityX, gestureEvent.data.flingStart.velocityY), WebSize()));
+ m_flingCurve = adoptPtr(Platform::current()->createFlingAnimationCurve(gestureEvent.sourceDevice, WebFloatPoint(gestureEvent.data.flingStart.velocityX, gestureEvent.data.flingStart.velocityY), WebSize()));
TRACE_EVENT_ASYNC_BEGIN0("webkit", "WebCompositorInputHandlerImpl::handleGestureFling::started", this);
m_flingParameters.delta = WebFloatPoint(gestureEvent.data.flingStart.velocityX, gestureEvent.data.flingStart.velocityY);
m_flingParameters.point = WebPoint(gestureEvent.x, gestureEvent.y);
m_flingParameters.globalPoint = WebPoint(gestureEvent.globalX, gestureEvent.globalY);
m_flingParameters.modifiers = gestureEvent.modifiers;
- m_flingParameters.sourceDevice = gestureEvent.data.flingStart.sourceDevice;
+ m_flingParameters.sourceDevice = gestureEvent.sourceDevice;
m_inputHandlerClient->scheduleAnimation();
return DidHandle;
}
@@ -238,7 +238,7 @@
}
case WebInputHandlerClient::ScrollStatusIgnored: {
TRACE_EVENT_INSTANT0("webkit", "WebCompositorInputHandlerImpl::handleGestureFling::ignored");
- if (gestureEvent.data.flingStart.sourceDevice == WebGestureEvent::Touchpad) {
+ if (gestureEvent.sourceDevice == WebGestureEvent::Touchpad) {
// We still pass the curve to the main thread if there's nothing scrollable, in case something
// registers a handler before the curve is over.
return DidNotHandle;
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (138628 => 138629)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-02 20:00:47 UTC (rev 138628)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-02 20:16:57 UTC (rev 138629)
@@ -702,7 +702,7 @@
m_lastWheelPosition = WebPoint(event.x, event.y);
m_lastWheelGlobalPosition = WebPoint(event.globalX, event.globalY);
m_flingModifier = event.modifiers;
- OwnPtr<WebGestureCurve> flingCurve = adoptPtr(Platform::current()->createFlingAnimationCurve(event.data.flingStart.sourceDevice, WebFloatPoint(event.data.flingStart.velocityX, event.data.flingStart.velocityY), WebSize()));
+ OwnPtr<WebGestureCurve> flingCurve = adoptPtr(Platform::current()->createFlingAnimationCurve(event.sourceDevice, WebFloatPoint(event.data.flingStart.velocityX, event.data.flingStart.velocityY), WebSize()));
m_gestureAnimation = WebActiveGestureAnimation::createAtAnimationStart(flingCurve.release(), this);
scheduleAnimation();
eventSwallowed = true;
Modified: trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp (138628 => 138629)
--- trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp 2013-01-02 20:00:47 UTC (rev 138628)
+++ trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp 2013-01-02 20:16:57 UTC (rev 138629)
@@ -345,14 +345,14 @@
gesture.type = WebInputEvent::GestureFlingStart;
gesture.data.flingStart.velocityX = 10;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchpad;
+ gesture.sourceDevice = WebGestureEvent::Touchpad;
m_inputHandler->handleInputEvent(gesture);
VERIFY_AND_RESET_MOCKS();
// Verify that a GestureFlingCancel during an animation cancels it.
gesture.type = WebInputEvent::GestureFlingCancel;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchpad;
+ gesture.sourceDevice = WebGestureEvent::Touchpad;
m_inputHandler->handleInputEvent(gesture);
}
@@ -366,14 +366,14 @@
.WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusOnMainThread));
gesture.type = WebInputEvent::GestureFlingStart;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchpad;
+ gesture.sourceDevice = WebGestureEvent::Touchpad;
m_inputHandler->handleInputEvent(gesture);
VERIFY_AND_RESET_MOCKS();
// Even if we didn't start a fling ourselves, we still need to send the cancel event to the widget.
gesture.type = WebInputEvent::GestureFlingCancel;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchpad;
+ gesture.sourceDevice = WebGestureEvent::Touchpad;
m_inputHandler->handleInputEvent(gesture);
}
@@ -386,7 +386,7 @@
.WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusIgnored));
gesture.type = WebInputEvent::GestureFlingStart;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchpad;
+ gesture.sourceDevice = WebGestureEvent::Touchpad;
m_inputHandler->handleInputEvent(gesture);
m_expectedDisposition = DropEvent;
@@ -394,7 +394,7 @@
// Since the previous fling was ignored, we should also be dropping the next flingCancel.
gesture.type = WebInputEvent::GestureFlingCancel;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchpad;
+ gesture.sourceDevice = WebGestureEvent::Touchpad;
m_inputHandler->handleInputEvent(gesture);
}
@@ -413,7 +413,7 @@
int modifiers = 7;
gesture.data.flingStart.velocityX = flingDelta.x;
gesture.data.flingStart.velocityY = flingDelta.y;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchpad;
+ gesture.sourceDevice = WebGestureEvent::Touchpad;
gesture.x = flingPoint.x;
gesture.y = flingPoint.y;
gesture.globalX = flingGlobalPoint.x;
@@ -499,7 +499,7 @@
int modifiers = 1;
gesture.data.flingStart.velocityX = flingDelta.x;
gesture.data.flingStart.velocityY = flingDelta.y;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchpad;
+ gesture.sourceDevice = WebGestureEvent::Touchpad;
gesture.x = flingPoint.x;
gesture.y = flingPoint.y;
gesture.globalX = flingGlobalPoint.x;
@@ -582,7 +582,7 @@
modifiers = 2;
gesture.data.flingStart.velocityX = flingDelta.x;
gesture.data.flingStart.velocityY = flingDelta.y;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchpad;
+ gesture.sourceDevice = WebGestureEvent::Touchpad;
gesture.x = flingPoint.x;
gesture.y = flingPoint.y;
gesture.globalX = flingGlobalPoint.x;
@@ -645,7 +645,7 @@
gesture.type = WebInputEvent::GestureFlingStart;
gesture.data.flingStart.velocityX = 10;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchscreen;
+ gesture.sourceDevice = WebGestureEvent::Touchscreen;
m_inputHandler->handleInputEvent(gesture);
VERIFY_AND_RESET_MOCKS();
@@ -654,7 +654,7 @@
// Verify that a GestureFlingCancel during an animation cancels it.
gesture.type = WebInputEvent::GestureFlingCancel;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchscreen;
+ gesture.sourceDevice = WebGestureEvent::Touchscreen;
m_inputHandler->handleInputEvent(gesture);
}
@@ -668,14 +668,14 @@
.WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusOnMainThread));
gesture.type = WebInputEvent::GestureFlingStart;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchscreen;
+ gesture.sourceDevice = WebGestureEvent::Touchscreen;
m_inputHandler->handleInputEvent(gesture);
VERIFY_AND_RESET_MOCKS();
// Even if we didn't start a fling ourselves, we still need to send the cancel event to the widget.
gesture.type = WebInputEvent::GestureFlingCancel;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchscreen;
+ gesture.sourceDevice = WebGestureEvent::Touchscreen;
m_inputHandler->handleInputEvent(gesture);
}
@@ -688,14 +688,14 @@
.WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusIgnored));
gesture.type = WebInputEvent::GestureFlingStart;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchscreen;
+ gesture.sourceDevice = WebGestureEvent::Touchscreen;
m_inputHandler->handleInputEvent(gesture);
VERIFY_AND_RESET_MOCKS();
// Even if we didn't start a fling ourselves, we still need to send the cancel event to the widget.
gesture.type = WebInputEvent::GestureFlingCancel;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchscreen;
+ gesture.sourceDevice = WebGestureEvent::Touchscreen;
m_inputHandler->handleInputEvent(gesture);
}
@@ -714,7 +714,7 @@
int modifiers = 7;
gesture.data.flingStart.velocityX = flingDelta.x;
gesture.data.flingStart.velocityY = flingDelta.y;
- gesture.data.flingStart.sourceDevice = WebGestureEvent::Touchscreen;
+ gesture.sourceDevice = WebGestureEvent::Touchscreen;
gesture.x = flingPoint.x;
gesture.y = flingPoint.y;
gesture.globalX = flingGlobalPoint.x;
