Fix WebView compositor input handling

android_webview/browser/in_process_renderer/in_process_view_renderer.cc

 // Copyright (c) 2013 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 "android_webview/browser/in_process_renderer/in_process_view_renderer.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/public/browser/draw_gl.h"
 #include "android_webview/public/browser/draw_sw.h"
@@ skipping 92 matching lines @@
   return true;
 }
 
 }  // namespace
 
 InProcessViewRenderer::InProcessViewRenderer(
     BrowserViewRenderer::Client* client,
     JavaHelper* java_helper)
     : client_(client),
       java_helper_(java_helper),
+      content_view_core_(NULL),
       web_contents_(NULL),
       compositor_(NULL),
       view_visible_(false),
       continuous_invalidate_(false),
       continuous_invalidate_task_pending_(false),
       width_(0),
       height_(0),
       attached_to_window_(false),
       hardware_initialized_(false),
       hardware_failed_(false),
@@ skipping 30 matching lines @@
     compositor_->SetClient(NULL);
   compositor_ = compositor;
   hardware_initialized_ = false;
   hardware_failed_ = false;
   compositor_->SetClient(this);
 
   if (attached_to_window_)
     client_->RequestProcessMode();
 }
 
+void InProcessViewRenderer::BindSynchronousInputEventFilter(
+    content::SynchronousInputEventFilter* input_event_filter) {
+  input_event_filter_ = input_event_filter;
+  if (content_view_core_)
+    content_view_core_->SetInputEventFilter(input_event_filter_);
+}
+
 void InProcessViewRenderer::SetContents(
     content::ContentViewCore* content_view_core) {
   // First remove association from the prior ContentViewCore / WebContents.
+  if (content_view_core_)
+    content_view_core_->SetInputEventFilter(NULL);
+
   if (web_contents_) {
     web_contents_->SetUserData(kUserDataKey, NULL);
     DCHECK(!web_contents_);  // WebContentsGone should have been called.
   }
 
   if (!content_view_core)
     return;
 
+  content_view_core_->SetInputEventFilter(input_event_filter_);
+
   web_contents_ = content_view_core->GetWebContents();
   web_contents_->SetUserData(kUserDataKey, new UserData(this));
 }
 
 void InProcessViewRenderer::WebContentsGone() {
   web_contents_ = NULL;
 }
 
 bool InProcessViewRenderer::PrepareDrawGL(int x, int y) {
   // No harm in updating |hw_rendering_scroll_| even if we return false.
@@ skipping 239 matching lines @@
   // TODO(joth): BrowserViewRendererImpl had a bunch of logic for dpi and page
   // scale here. Determine what if any needs bringing over to this class.
   return CompositeSW(canvas);
 }
 
 bool InProcessViewRenderer::CompositeSW(SkCanvas* canvas) {
   return compositor_ && compositor_->DemandDrawSw(canvas);
 }
 
 }  // namespace android_webview