Fix WebView compositor input handling

content/browser/android/content_view_core_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #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"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/ssl/ssl_host_state.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
@@ skipping 502 matching lines @@
 unsigned int ContentViewCoreImpl::GetScaledContentTexture(
     float scale,
     gfx::Size* out_size) {
   RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();
   if (!view)
     return 0;
 
   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);
 }
 
 void ContentViewCoreImpl::RemoveFrameInfoCallback(
     const UpdateFrameInfoCallback& callback) {
   for (size_t i = 0; i < update_frame_info_callbacks_.size(); ++i) {
     if (update_frame_info_callbacks_[i].Equals(callback)) {
       update_frame_info_callbacks_.erase(
@@ skipping 110 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return 0.f;
   return Java_ContentViewCore_getOverdrawBottomHeightPix(env, j_obj.obj())
       / GetDpiScale();
 }
 
 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) {
   root_layer_->AddChild(layer);
 }
 
 void ContentViewCoreImpl::RemoveLayer(scoped_refptr<cc::Layer> layer) {
   layer->RemoveFromParent();
 }
 
@@ skipping 868 matching lines @@
       reinterpret_cast<ui::ViewAndroid*>(view_android),
       reinterpret_cast<ui::WindowAndroid*>(window_android));
   return reinterpret_cast<jint>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content