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 7d61f3fd11fdce6284fbf1cf1d7353c458b02b9e..900f011766ac6e9787ee5321b2731b9996fb3630 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -684,14 +684,21 @@ bool RenderWidgetHostViewAndroid::OnTouchEvent( |
return true; |
} |
- // Short-circuit touch forwarding if no touch handlers exist. |
- if (!host_->ShouldForwardTouchEvent()) { |
+ if (host_->ShouldForwardTouchEvent()) { |
+ blink::WebTouchEvent web_event = CreateWebTouchEventFromMotionEvent(event); |
+ host_->ForwardTouchEventWithLatencyInfo(web_event, |
+ CreateLatencyInfo(web_event)); |
+ } else { |
const bool event_consumed = false; |
gesture_provider_.OnTouchEventAck(event_consumed); |
- return true; |
} |
- SendTouchEvent(CreateWebTouchEventFromMotionEvent(event)); |
+ // Send a proactive BeginFrame on the next vsync to reduce latency. |
+ // This is good enough as long as the first touch event has Begin semantics |
+ // and the actual scroll happens on the next vsync. |
+ if (observing_root_window_) |
+ RequestVSyncUpdate(BEGIN_FRAME); |
+ |
return true; |
} |
@@ -1508,19 +1515,6 @@ void RenderWidgetHostViewAndroid::SendKeyEvent( |
host_->ForwardKeyboardEvent(event); |
} |
-void RenderWidgetHostViewAndroid::SendTouchEvent( |
- const blink::WebTouchEvent& event) { |
- if (host_) |
- host_->ForwardTouchEventWithLatencyInfo(event, CreateLatencyInfo(event)); |
- |
- // Send a proactive BeginFrame on the next vsync to reduce latency. |
- // This is good enough as long as the first touch event has Begin semantics |
- // and the actual scroll happens on the next vsync. |
- // TODO: Is this actually still needed? |
- if (observing_root_window_) |
- RequestVSyncUpdate(BEGIN_FRAME); |
-} |
- |
void RenderWidgetHostViewAndroid::SendMouseEvent( |
const blink::WebMouseEvent& event) { |
if (host_) |