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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 15920002: Fix WebView compositor input handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test Created 7 years, 6 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
« content/browser/android/in_process/synchronous_input_event_filter.h ('K') | « content/browser/android/sync_input_event_filter.cc ('k') | content/content_browser.gypi » ('j') | content/renderer/android/synchronous_compositor_factory.h » ('J')
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 aedf26abebef2fb24b48b26e1ccf7d865190373a..e2bd84e6fb62ae3d3d3b0319adecb9e0b3d7e81c 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -18,6 +18,7 @@
#include "cc/output/compositor_frame.h"
#include "cc/output/compositor_frame_ack.h"
#include "content/browser/android/content_view_core_impl.h"
+#include "content/browser/android/in_process/synchronous_compositor_impl.h"
#include "content/browser/android/overscroll_glow.h"
#include "content/browser/gpu/gpu_surface_tracker.h"
#include "content/browser/renderer_host/compositor_impl_android.h"
@@ -808,10 +809,10 @@ void RenderWidgetHostViewAndroid::UnhandledWheelEvent(
InputEventAckState RenderWidgetHostViewAndroid::FilterInputEvent(
const WebKit::WebInputEvent& input_event) {
- if (!content_view_core_)
- return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
-
- return content_view_core_->FilterInputEvent(input_event);
+ SynchronousCompositorImpl* compositor =
+ SynchronousCompositorImpl::FromRoutingID(host_->GetRoutingID());
+ return compositor ? compositor->HandleInputEvent(input_event)
+ : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
}
void RenderWidgetHostViewAndroid::OnAccessibilityNotifications(
« content/browser/android/in_process/synchronous_input_event_filter.h ('K') | « content/browser/android/sync_input_event_filter.cc ('k') | content/content_browser.gypi » ('j') | content/renderer/android/synchronous_compositor_factory.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698