| Index: ui/events/blink/blink_event_util.cc
|
| diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc
|
| index f382fc1ce5bbc1f5519eed6dcbe3a358a0180828..4cd7ac30988d023bc699e7b9a121a2850e1ca46f 100644
|
| --- a/ui/events/blink/blink_event_util.cc
|
| +++ b/ui/events/blink/blink_event_util.cc
|
| @@ -962,11 +962,13 @@ blink::WebInputEvent::Modifiers DomCodeToWebInputEventModifiers(DomCode code) {
|
| return static_cast<blink::WebInputEvent::Modifiers>(0);
|
| }
|
|
|
| -bool IsGestureScollOrPinch(WebInputEvent::Type type) {
|
| +bool IsGestureScrollOrFlingOrPinch(WebInputEvent::Type type) {
|
| switch (type) {
|
| case blink::WebGestureEvent::GestureScrollBegin:
|
| case blink::WebGestureEvent::GestureScrollUpdate:
|
| case blink::WebGestureEvent::GestureScrollEnd:
|
| + case blink::WebGestureEvent::GestureFlingStart:
|
| + case blink::WebGestureEvent::GestureFlingCancel:
|
| case blink::WebGestureEvent::GesturePinchBegin:
|
| case blink::WebGestureEvent::GesturePinchUpdate:
|
| case blink::WebGestureEvent::GesturePinchEnd:
|
|
|