Move compositor thread input handling logic into content

content/renderer/gpu/render_widget_compositor.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 "content/renderer/gpu/render_widget_compositor.h"
 
 #include <limits>
+#include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "cc/base/switches.h"
 #include "cc/base/thread_impl.h"
 #include "cc/debug/layer_tree_debug_state.h"
 #include "cc/layers/layer.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/gpu/input_handler_manager.h"
 #include "content/renderer/render_thread_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h"
 #include "ui/gl/gl_switches.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
-#include "webkit/renderer/compositor_bindings/web_to_ccinput_handler_adapter.h"
 
 namespace cc {
 class Layer;
 }
 
 using WebKit::WebFloatPoint;
 using WebKit::WebSize;
 using WebKit::WebRect;
 
 namespace content {
@@ skipping 245 matching lines @@
   return compositor.Pass();
 }
 
 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget)
   : suppress_schedule_composite_(false),
     widget_(widget) {
 }
 
 RenderWidgetCompositor::~RenderWidgetCompositor() {}
 
+const base::WeakPtr<cc::InputHandler>&
+RenderWidgetCompositor::GetInputHandler() {
+  return layer_tree_host_->GetInputHandler();
+}
+
 void RenderWidgetCompositor::SetSuppressScheduleComposite(bool suppress) {
   if (suppress_schedule_composite_ == suppress)
     return;
 
   if (suppress)
     TRACE_EVENT_ASYNC_BEGIN0("gpu",
         "RenderWidgetCompositor::SetSuppressScheduleComposite", this);
   else
     TRACE_EVENT_ASYNC_END0("gpu",
         "RenderWidgetCompositor::SetSuppressScheduleComposite", this);
@@ skipping 222 matching lines @@
 
 scoped_ptr<cc::OutputSurface> RenderWidgetCompositor::CreateOutputSurface() {
   return widget_->CreateOutputSurface();
 }
 
 void RenderWidgetCompositor::DidInitializeOutputSurface(bool success) {
   if (!success)
     widget_->webwidget()->didExitCompositingMode();
 }
 
-scoped_ptr<cc::InputHandlerClient>
-RenderWidgetCompositor::CreateInputHandlerClient() {
-  scoped_ptr<cc::InputHandlerClient> ret;
-  scoped_ptr<WebKit::WebInputHandler> web_handler(
-      widget_->webwidget()->createInputHandler());
-  if (web_handler)
-     ret = WebKit::WebToCCInputHandlerAdapter::create(web_handler.Pass());
-  return ret.Pass();
-}
-
 void RenderWidgetCompositor::WillCommit() {
   widget_->InstrumentWillComposite();
 }
 
 void RenderWidgetCompositor::DidCommit() {
   widget_->DidCommitCompositorFrame();
   widget_->didBecomeReadyForAdditionalInput();
 }
 
 void RenderWidgetCompositor::DidCommitAndDrawFrame() {
@@ skipping 14 matching lines @@
   return RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
 }
 
 scoped_refptr<cc::ContextProvider>
 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() {
   return RenderThreadImpl::current()->
       OffscreenContextProviderForCompositorThread();
 }
 
 }  // namespace content