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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 1074553002: [Android] Properly filter GestureFlingCancel events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 318584e90469b20fb2afdfe7d6e68fbc543036fd..337c9bc32dd22fb09fdeaddb1c2e61ecc5d73fd6 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1686,9 +1686,12 @@ InputEventAckState RenderWidgetHostViewAndroid::FilterInputEvent(
return INPUT_EVENT_ACK_STATE_CONSUMED;
}
- if (content_view_core_ &&
- content_view_core_->FilterInputEvent(input_event))
- return INPUT_EVENT_ACK_STATE_CONSUMED;
+ if (content_view_core_) {
+ InputEventAckState ack_result =
+ content_view_core_->FilterInputEvent(input_event);
+ if (ack_result != INPUT_EVENT_ACK_STATE_NOT_CONSUMED)
+ return ack_result;
+ }
if (!host_)
return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698