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 3d5386a15c85a4da19027d6c24a982eb77b5a2a2..bfba064bdf6889c5778526f601429c194affc65e 100644 |
--- a/content/browser/renderer_host/input/web_input_event_util.cc |
+++ b/content/browser/renderer_host/input/web_input_event_util.cc |
@@ -256,7 +256,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); |
@@ -267,6 +268,7 @@ blink::WebTouchEvent CreateWebTouchEventFromMotionEvent( |
ToWebInputEventType(event.GetAction()), |
(event.GetEventTime() - base::TimeTicks()).InSecondsF(), |
&result); |
+ result.causesScrollingIfUncanceled = may_cause_scrolling; |
result.modifiers = EventFlagsToWebEventModifiers(event.GetFlags()); |
result.touchesLength = |