Fix WebView compositor input handling

content/browser/android/content_view_core_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <vector>
 
 #include "base/android/jni_android.h"
@@ skipping 15 matching lines @@
 
 struct WebMenuItem;
 
 namespace ui {
 class ViewAndroid;
 class WindowAndroid;
 }
 
 namespace content {
 class RenderWidgetHostViewAndroid;
-class SyncInputEventFilter;
 
 // TODO(jrg): this is a shell.  Upstream the rest.
 class ContentViewCoreImpl : public ContentViewCore,
                             public NotificationObserver {
  public:
   static ContentViewCoreImpl* FromWebContents(WebContents* web_contents);
   ContentViewCoreImpl(JNIEnv* env,
                       jobject obj,
                       bool hardware_accelerated,
                       WebContents* web_contents,
                       ui::ViewAndroid* view_android,
                       ui::WindowAndroid* window_android);
 
   // ContentViewCore implementation.
   virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;
   virtual WebContents* GetWebContents() const OVERRIDE;
   virtual ui::ViewAndroid* GetViewAndroid() const OVERRIDE;
   virtual ui::WindowAndroid* GetWindowAndroid() const OVERRIDE;
   virtual scoped_refptr<cc::Layer> GetLayer() const OVERRIDE;
   virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;
   virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE;
   virtual void ShowPastePopup(int x, int y) OVERRIDE;
   virtual unsigned int GetScaledContentTexture(
       float scale,
       gfx::Size* out_size) OVERRIDE;
   virtual float GetDpiScale() const OVERRIDE;
   virtual void RequestContentClipping(const gfx::Rect& clipping,
                                       const gfx::Size& content_size) OVERRIDE;
+  virtual void SetInputEventFilterCallback(
+      const InputEventFilterCallback& callback) OVERRIDE;
   virtual void AddFrameInfoCallback(
       const UpdateFrameInfoCallback& callback) OVERRIDE;
   virtual void RemoveFrameInfoCallback(
       const UpdateFrameInfoCallback& callback) OVERRIDE;
 
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
   // --------------------------------------------------------------------------
 
   void OnJavaContentViewCoreDestroyed(JNIEnv* env, jobject obj);
@@ skipping 279 matching lines @@
 
   // The Android view that can be used to add and remove decoration layers
   // like AutofillPopup.
   ui::ViewAndroid* view_android_;
 
   // The owning window that has a hold of main application activity.
   ui::WindowAndroid* window_android_;
 
   std::vector<UpdateFrameInfoCallback> update_frame_info_callbacks_;
 
-  // Optional browser-side input event filtering.
-  scoped_ptr<SyncInputEventFilter> input_event_filter_;
+  // Optional in-process input event filtering.
+  InputEventFilterCallback input_event_filter_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_