Fix WebView compositor input handling

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index abfe74ec48b7c4f3abb658d9641fbc89192b40d3..edcae80aea617091485ab48f500992fa8c00d53e 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -17,7 +17,6 @@
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.h"
 #include "content/browser/android/media_player_manager_impl.h"
-#include "content/browser/android/sync_input_event_filter.h"
 #include "content/browser/android/touch_point.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
@@ -540,6 +539,11 @@ unsigned int ContentViewCoreImpl::GetScaledContentTexture(
   return view->GetScaledContentTexture(scale, out_size);
 }
 
+void ContentViewCoreImpl::SetInputEventFilterCallback(
+    const InputEventFilterCallback& callback) {
+  input_event_filter_callback_ = callback;
+}
+
 void ContentViewCoreImpl::AddFrameInfoCallback(
     const UpdateFrameInfoCallback& callback) {
   update_frame_info_callbacks_.push_back(callback);
@@ -670,10 +674,11 @@ float ContentViewCoreImpl::GetOverdrawBottomHeightDip() const {
 
 InputEventAckState ContentViewCoreImpl::FilterInputEvent(
     const WebKit::WebInputEvent& input_event) {
-  if (!input_event_filter_)
+  if (!input_event_filter_callback_.is_null())
     return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
 
-  return input_event_filter_->HandleInputEvent(input_event);
+  RenderViewHost* host = web_contents_->GetRenderViewHost();
+  return input_event_filter_callback_.Run(host->GetRoutingID(), input_event);
 }
 
 void ContentViewCoreImpl::AttachLayer(scoped_refptr<cc::Layer> layer) {