Index: content/browser/renderer_host/input/gesture_event_queue.cc |
=================================================================== |
--- content/browser/renderer_host/input/gesture_event_queue.cc (revision 257734) |
+++ 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; |
+ |
jam
2014/03/19 16:44:36
ditto
Peter Kasting
2014/03/19 21:10:57
Done.
|
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_; |
jam
2014/03/19 16:44:36
leave the code as before; I think it's more readab
Peter Kasting
2014/03/19 21:10:57
Done. Sorry, I didn't view this as a "style chang
|
} |
- |
- 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( |