| Index: content/browser/renderer_host/input/gesture_event_queue.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/input/gesture_event_queue.cc (revision 256983)
|
| +++ content/browser/renderer_host/input/gesture_event_queue.cc (working copy)
|
| @@ -84,21 +84,18 @@
|
| scrolling_in_progress_ = true;
|
| debouncing_deferral_queue_.clear();
|
| return true;
|
| +
|
| case WebInputEvent::GesturePinchBegin:
|
| case WebInputEvent::GesturePinchEnd:
|
| case WebInputEvent::GesturePinchUpdate:
|
| // TODO(rjkroege): Debounce pinch (http://crbug.com/147647)
|
| return true;
|
| +
|
| default:
|
| - if (scrolling_in_progress_) {
|
| + if (scrolling_in_progress_)
|
| debouncing_deferral_queue_.push_back(gesture_event);
|
| - return false;
|
| - }
|
| - return true;
|
| + return !scrolling_in_progress_;
|
| }
|
| -
|
| - NOTREACHED();
|
| - return false;
|
| }
|
|
|
| // NOTE: The filters are applied successively. This simplifies the change.
|
| @@ -150,8 +147,6 @@
|
| default:
|
| return true;
|
| }
|
| - NOTREACHED();
|
| - return false;
|
| }
|
|
|
| bool GestureEventQueue::ShouldForwardForCoalescing(
|
|
|