Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(373)

Unified Diff: content/browser/renderer_host/input/immediate_input_router.cc

Issue 25268002: Make tapDown async. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address jdduke's comments. Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/input/immediate_input_router.cc
diff --git a/content/browser/renderer_host/input/immediate_input_router.cc b/content/browser/renderer_host/input/immediate_input_router.cc
index a4c69054fd16cb8838053438b95b287a81ae904c..98582b95b884302e00ffa681c1b3dde75dc9be3b 100644
--- a/content/browser/renderer_host/input/immediate_input_router.cc
+++ b/content/browser/renderer_host/input/immediate_input_router.cc
@@ -485,7 +485,7 @@ void ImmediateInputRouter::ProcessInputEventAck(
} else if (WebInputEvent::isTouchEventType(type)) {
ProcessTouchAck(ack_result, latency_info);
} else if (WebInputEvent::isGestureEventType(type)) {
- ProcessGestureAck(type, ack_result);
+ ProcessGestureAck(event_type, ack_result);
}
// WARNING: |this| may be deleted at this point.
@@ -541,9 +541,13 @@ void ImmediateInputRouter::ProcessWheelAck(InputEventAckState ack_result) {
}
}
-void ImmediateInputRouter::ProcessGestureAck(int type,
+void ImmediateInputRouter::ProcessGestureAck(WebInputEvent::Type type,
InputEventAckState ack_result) {
+ if (GestureEventFilter::IsGestureEventTypeAsync(type))
+ return;
const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result);
+ // Note: the order the ack is passed to |ack_handler_| and
+ // |gesture_event_filter_| matters. See crbug.com/302592.
ack_handler_->OnGestureEventAck(
gesture_event_filter_->GetGestureEventAwaitingAck(), ack_result);
gesture_event_filter_->ProcessGestureAck(processed, type);

Powered by Google App Engine
This is Rietveld 408576698