| 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);
|
| }
|
|
|
|
|