Index: content/renderer/gpu/render_widget_compositor.cc |
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc |
index 9a59785afdc02c7c63961dbd87d31b8c5c0c060a..ea45b577b02a7daea7ee9aaa96c15624391471eb 100644 |
--- a/content/renderer/gpu/render_widget_compositor.cc |
+++ b/content/renderer/gpu/render_widget_compositor.cc |
@@ -14,6 +14,7 @@ |
#include "cc/base/switches.h" |
#include "cc/base/thread_impl.h" |
#include "cc/debug/layer_tree_debug_state.h" |
+#include "cc/input/input_handler.h" |
#include "cc/layers/layer.h" |
#include "cc/trees/layer_tree_host.h" |
#include "content/common/gpu/client/context_provider_command_buffer.h" |
@@ -24,7 +25,6 @@ |
#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; |
@@ -535,12 +535,7 @@ void RenderWidgetCompositor::DidInitializeOutputSurface(bool success) { |
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(); |
+ return widget_->CreateInputHandlerClient(); |
} |
void RenderWidgetCompositor::WillCommit() { |