Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1657)

Unified Diff: content/browser/renderer_host/input/gesture_event_queue.cc

Issue 304793003: use enum to specify deviceSource for fling animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed desired #include Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/input/gesture_event_queue.cc
diff --git a/content/browser/renderer_host/input/gesture_event_queue.cc b/content/browser/renderer_host/input/gesture_event_queue.cc
index 9811e7357e1782e91bb64ff82a8b7f48fb0cb9dd..5b043e847dedd187555a0245cbc653cf7365787e 100644
--- a/content/browser/renderer_host/input/gesture_event_queue.cc
+++ b/content/browser/renderer_host/input/gesture_event_queue.cc
@@ -103,9 +103,9 @@ bool GestureEventQueue::ShouldForward(
bool GestureEventQueue::ShouldForwardForZeroVelocityFlingStart(
const GestureEventWithLatencyInfo& gesture_event) const {
return gesture_event.event.type != WebInputEvent::GestureFlingStart ||
- gesture_event.event.sourceDevice != WebGestureEvent::Touchpad ||
- gesture_event.event.data.flingStart.velocityX != 0 ||
- gesture_event.event.data.flingStart.velocityY != 0;
+ gesture_event.event.sourceDevice != blink::WebGestureDeviceTouchpad ||
+ gesture_event.event.data.flingStart.velocityX != 0 ||
+ gesture_event.event.data.flingStart.velocityY != 0;
}
bool GestureEventQueue::ShouldForwardForGFCFiltering(
@@ -118,7 +118,7 @@ bool GestureEventQueue::ShouldForwardForTapSuppression(
const GestureEventWithLatencyInfo& gesture_event) {
switch (gesture_event.event.type) {
case WebInputEvent::GestureFlingCancel:
- if (gesture_event.event.sourceDevice == WebGestureEvent::Touchscreen)
+ if (gesture_event.event.sourceDevice == blink::WebGestureDeviceTouchpad)
touchscreen_tap_suppression_controller_.GestureFlingCancel();
else
touchpad_tap_suppression_controller_.GestureFlingCancel();
@@ -129,7 +129,7 @@ bool GestureEventQueue::ShouldForwardForTapSuppression(
case WebInputEvent::GestureTapCancel:
case WebInputEvent::GestureTap:
case WebInputEvent::GestureDoubleTap:
- if (gesture_event.event.sourceDevice == WebGestureEvent::Touchscreen) {
+ if (gesture_event.event.sourceDevice == blink::WebGestureDeviceTouchpad) {
return !touchscreen_tap_suppression_controller_.FilterTapEvent(
gesture_event);
}
@@ -191,7 +191,8 @@ void GestureEventQueue::ProcessGestureAck(InputEventAckState ack_result,
const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result);
if (type == WebInputEvent::GestureFlingCancel) {
- if (event_with_latency.event.sourceDevice == WebGestureEvent::Touchscreen)
+ if (event_with_latency.event.sourceDevice ==
+ blink::WebGestureDeviceTouchpad)
touchscreen_tap_suppression_controller_.GestureFlingCancelAck(processed);
else
touchpad_tap_suppression_controller_.GestureFlingCancelAck(processed);

Powered by Google App Engine
This is Rietveld 408576698