| Index: content/browser/renderer_host/input/touch_action_filter.cc
|
| diff --git a/content/browser/renderer_host/input/touch_action_filter.cc b/content/browser/renderer_host/input/touch_action_filter.cc
|
| index 80c85c3b91c9a44695f079a518e6de6757345e5c..32dc8f780c3a4ec6d7a4f117ddad8b83b2c3f98d 100644
|
| --- a/content/browser/renderer_host/input/touch_action_filter.cc
|
| +++ b/content/browser/renderer_host/input/touch_action_filter.cc
|
| @@ -61,7 +61,8 @@ bool TouchActionFilter::FilterGestureEvent(WebGestureEvent* gesture_event) {
|
|
|
| case WebInputEvent::GesturePinchBegin:
|
| DCHECK(!drop_pinch_gesture_events_);
|
| - if (allowed_touch_action_ == TOUCH_ACTION_AUTO) {
|
| + if (allowed_touch_action_ == TOUCH_ACTION_AUTO ||
|
| + allowed_touch_action_ | TOUCH_ACTION_PINCH_ZOOM) {
|
| // Pinch events are always bracketed by scroll events, and the W3C
|
| // standard touch-action provides no way to disable scrolling without
|
| // also disabling pinching.
|
|
|