Fix WebView compositor input handling

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index b9edb67eae1fc0aa0c54daae722eacfc03caf19b..2ddea0c3b9949c501917dd7ab3e7ee9511620c8a 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -33,7 +33,6 @@ class WindowAndroid;
 
 namespace content {
 class RenderWidgetHostViewAndroid;
-class SyncInputEventFilter;
 
 // TODO(jrg): this is a shell.  Upstream the rest.
 class ContentViewCoreImpl : public ContentViewCore,
@@ -62,6 +61,8 @@ class ContentViewCoreImpl : public ContentViewCore,
   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(
@@ -361,8 +362,8 @@ class ContentViewCoreImpl : public ContentViewCore,
 
   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);
 };