Fix WebView compositor input handling

content/browser/android/in_process/synchronous_compositor_impl.cc

 // Copyright 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 "content/browser/android/in_process/synchronous_compositor_impl.h"
 
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
+#include "content/browser/android/in_process/synchronous_input_event_filter.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/renderer/android/synchronous_compositor_factory.h"
 
 namespace content {
 
 namespace {
 
@@ skipping 23 matching lines @@
       GetCompositorMessageLoop() OVERRIDE {
     return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
   }
 
   virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
       int routing_id) OVERRIDE {
     scoped_ptr<SynchronousCompositorOutputSurface> output_surface(
         new SynchronousCompositorOutputSurface(routing_id));
     return output_surface.PassAs<cc::OutputSurface>();
   }
+
+  virtual InputHandlerManagerClient* GetInputHandlerManagerClient() OVERRIDE {
+    return synchronous_input_event_filter();
+  }
+
+  SynchronousInputEventFilter* synchronous_input_event_filter() {
+    return &synchronous_input_event_filter_;
+  }
+
+ private:
+  SynchronousInputEventFilter synchronous_input_event_filter_;
 };
 
 base::LazyInstance<SynchronousCompositorFactoryImpl>::Leaky g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SynchronousCompositorImpl);
 
 // static
-SynchronousCompositorImpl* SynchronousCompositorImpl::FromRoutingID(
-    int routing_id) {
-  RenderViewHost* rvh = RenderViewHost::FromID(GetInProcessRendererId(),
-                                               routing_id);
+SynchronousCompositorImpl* SynchronousCompositorImpl::FromID(int process_id,
+                                                             int routing_id) {
+  if (g_factory == NULL)
+    return NULL;
+  RenderViewHost* rvh = RenderViewHost::FromID(process_id, routing_id);
   if (!rvh)
     return NULL;
   WebContents* contents = WebContents::FromRenderViewHost(rvh);
   if (!contents)
     return NULL;
   return FromWebContents(contents);
 }
 
+SynchronousCompositorImpl* SynchronousCompositorImpl::FromRoutingID(
+    int routing_id) {
+  return FromID(GetInProcessRendererId(), routing_id);
+}
+
 SynchronousCompositorImpl::SynchronousCompositorImpl(WebContents* contents)
     : compositor_client_(NULL),
       output_surface_(NULL),
       contents_(contents) {
 }
 
 SynchronousCompositorImpl::~SynchronousCompositorImpl() {
   if (compositor_client_)
     compositor_client_->DidDestroyCompositor(this);
 }
@@ skipping 48 matching lines @@
     compositor_client_ = NULL;
   }
 }
 
 void SynchronousCompositorImpl::SetContinuousInvalidate(bool enable) {
   DCHECK(CalledOnValidThread());
   if (compositor_client_)
     compositor_client_->SetContinuousInvalidate(enable);
 }
 
+InputEventAckState SynchronousCompositorImpl::HandleInputEvent(
+    const WebKit::WebInputEvent& input_event) {
+  DCHECK(CalledOnValidThread());
+  return g_factory.Get().synchronous_input_event_filter()->HandleInputEvent(
+      routing_id_, input_event);
+}
+
 // Not using base::NonThreadSafe as we want to enforce a more exacting threading
 // requirement: SynchronousCompositorImpl() must only be used on the UI thread.
 bool SynchronousCompositorImpl::CalledOnValidThread() const {
   return BrowserThread::CurrentlyOn(BrowserThread::UI);
 }
 
 // static
 void SynchronousCompositor::SetClientForWebContents(
     WebContents* contents,
     SynchronousCompositorClient* client) {
   DCHECK(contents);
   if (client) {
     g_factory.Get();  // Ensure it's initialized.
     SynchronousCompositorImpl::CreateForWebContents(contents);
   }
   if (SynchronousCompositorImpl* instance =
       SynchronousCompositorImpl::FromWebContents(contents)) {
     instance->SetClient(client);
   }
 }
 
 }  // namespace content