Chromium Code Reviews| 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 62b98a736ba704483d65ce39502ad9049c317703..0c140afb2867df46001b76d8faa5fc7ec81f5cea 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
| @@ -217,7 +217,8 @@ scoped_ptr<TouchSelectionController> CreateSelectionController( |
| } |
| ui::GestureProvider::Config CreateGestureProviderConfig() { |
| - ui::GestureProvider::Config config = ui::DefaultGestureProviderConfig(); |
| + ui::GestureProvider::Config config = ui::GetGestureProviderConfig( |
| + ui::GestureProviderConfigType::CURRENT_PLATFORM); |
| config.disable_click_delay = |
| base::CommandLine::ForCurrentProcess()->HasSwitch( |
| switches::kDisableClickDelay); |
| @@ -709,11 +710,13 @@ bool RenderWidgetHostViewAndroid::OnTouchEvent( |
| if (gesture_text_selector_.OnTouchEvent(event)) |
| return true; |
| - if (!gesture_provider_.OnTouchEvent(event)) |
| + auto result = gesture_provider_.OnTouchEvent(event); |
|
tdresser
2014/10/31 12:34:11
See other comment on auto.
|
| + if (!result.succeeded) |
| return false; |
| if (host_->ShouldForwardTouchEvent()) { |
| - blink::WebTouchEvent web_event = CreateWebTouchEventFromMotionEvent(event); |
| + blink::WebTouchEvent web_event = |
| + CreateWebTouchEventFromMotionEvent(event, result.did_generate_scroll); |
| host_->ForwardTouchEventWithLatencyInfo(web_event, |
| CreateLatencyInfo(web_event)); |
| } else { |