| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index 4f53cd0bf5291fbf61c8648ea3c666ceb0d03ab1..c310899863121c44b103613592bb552a0752adb9 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -1070,15 +1070,17 @@ void RenderWidgetHostViewAndroid::UnhandledWheelEvent(
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::GestureEventAck(
|
| - int gesture_event_type,
|
| + const blink::WebGestureEvent& event,
|
| InputEventAckState ack_result) {
|
| - if (gesture_event_type == blink::WebInputEvent::GestureScrollUpdate &&
|
| + if (event.type == blink::WebInputEvent::GestureScrollUpdate &&
|
| ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) {
|
| content_view_core_->OnScrollUpdateGestureConsumed();
|
| }
|
| - if (gesture_event_type == blink::WebInputEvent::GestureFlingStart &&
|
| + if (event.type == blink::WebInputEvent::GestureFlingStart &&
|
| ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS) {
|
| - content_view_core_->UnhandledFlingStartEvent();
|
| + content_view_core_->UnhandledFlingStartEvent(
|
| + event.data.flingStart.velocityX,
|
| + event.data.flingStart.velocityY);
|
| }
|
| }
|
|
|
| @@ -1202,7 +1204,6 @@ void RenderWidgetHostViewAndroid::SendTouchEvent(
|
| host_->ForwardTouchEventWithLatencyInfo(event, CreateLatencyInfo(event));
|
| }
|
|
|
| -
|
| void RenderWidgetHostViewAndroid::SendMouseEvent(
|
| const blink::WebMouseEvent& event) {
|
| if (host_)
|
| @@ -1222,7 +1223,7 @@ void RenderWidgetHostViewAndroid::SendGestureEvent(
|
| overscroll_effect_->Enable();
|
|
|
| if (host_)
|
| - host_->ForwardGestureEventWithLatencyInfo(event, CreateLatencyInfo(event));
|
| + host_->ForwardGestureEvent(event);
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::SelectRange(const gfx::Point& start,
|
| @@ -1334,8 +1335,6 @@ void RenderWidgetHostViewAndroid::RunAckCallbacks() {
|
|
|
| void RenderWidgetHostViewAndroid::HasTouchEventHandlers(
|
| bool need_touch_events) {
|
| - if (content_view_core_)
|
| - content_view_core_->HasTouchEventHandlers(need_touch_events);
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::OnCompositingDidCommit() {
|
|
|