| Index: content/browser/renderer_host/input/web_input_event_util.cc
|
| diff --git a/content/browser/renderer_host/input/web_input_event_util.cc b/content/browser/renderer_host/input/web_input_event_util.cc
|
| index 81fc359e63c6be3f0d8cc079ce8f463f7b06099d..d25a80df0e4889c8c6081556e23ca9d6099d63b9 100644
|
| --- a/content/browser/renderer_host/input/web_input_event_util.cc
|
| +++ b/content/browser/renderer_host/input/web_input_event_util.cc
|
| @@ -255,7 +255,8 @@ void UpdateWindowsKeyCodeAndKeyIdentifier(blink::WebKeyboardEvent* event,
|
| }
|
|
|
| blink::WebTouchEvent CreateWebTouchEventFromMotionEvent(
|
| - const ui::MotionEvent& event) {
|
| + const ui::MotionEvent& event,
|
| + bool may_cause_scrolling) {
|
| COMPILE_ASSERT(static_cast<int>(MotionEvent::MAX_TOUCH_POINT_COUNT) ==
|
| static_cast<int>(blink::WebTouchEvent::touchesLengthCap),
|
| inconsistent_maximum_number_of_active_touch_points);
|
| @@ -266,6 +267,7 @@ blink::WebTouchEvent CreateWebTouchEventFromMotionEvent(
|
| ToWebInputEventType(event.GetAction()),
|
| (event.GetEventTime() - base::TimeTicks()).InSecondsF(),
|
| &result);
|
| + result.defaultActionMayCauseScrolling = may_cause_scrolling;
|
|
|
| result.modifiers = EventFlagsToWebEventModifiers(event.GetFlags());
|
| result.touchesLength =
|
|
|