| 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 32d0c022837e4fb27307ab3f99d7952f32369550..54321bfb43f8b1e5b938c4fe3dce53464e7456d7 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);
|
| @@ -713,7 +714,10 @@ bool RenderWidgetHostViewAndroid::OnTouchEvent(
|
| return false;
|
|
|
| if (host_->ShouldForwardTouchEvent()) {
|
| - blink::WebTouchEvent web_event = CreateWebTouchEventFromMotionEvent(event);
|
| + bool event_may_cause_scrolling =
|
| + gesture_provider_.LastTouchEventDidGenerateScroll();
|
| + blink::WebTouchEvent web_event =
|
| + CreateWebTouchEventFromMotionEvent(event, event_may_cause_scrolling);
|
| host_->ForwardTouchEventWithLatencyInfo(web_event,
|
| CreateLatencyInfo(web_event));
|
| } else {
|
|
|