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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 304793003: use enum to specify deviceSource for fling animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased for parallel breaking changes 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/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 0c282732ba8abdd566666d26a740cc92d3781e55..3be6df14d65056a36d83f5eec59210d83747da10 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1216,7 +1216,7 @@ InputEventAckState RenderWidgetHostViewAura::FilterInputEvent(
static_cast<const WebGestureEvent&>(input_event);
// Zero-velocity touchpad flings are an Aura-specific signal that the
// touchpad scroll has ended, and should not be forwarded to the renderer.
- if (gesture_event.sourceDevice == WebGestureEvent::Touchpad &&
+ if (gesture_event.sourceDevice == blink::WebGestureDeviceTouchpad &&
!gesture_event.data.flingStart.velocityX &&
!gesture_event.data.flingStart.velocityY) {
consumed = true;
@@ -1984,7 +1984,7 @@ void RenderWidgetHostViewAura::OnGestureEvent(ui::GestureEvent* event) {
// event to stop any in-progress flings.
blink::WebGestureEvent fling_cancel = gesture;
fling_cancel.type = blink::WebInputEvent::GestureFlingCancel;
- fling_cancel.sourceDevice = blink::WebGestureEvent::Touchscreen;
+ fling_cancel.sourceDevice = blink::WebGestureDeviceTouchscreen;
host_->ForwardGestureEvent(fling_cancel);
}

Powered by Google App Engine
This is Rietveld 408576698