Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(412)

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 13844021: Move compositor thread input handling logic into content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 c57f505ffd31478e997701c55b11a6e88e1b48a7..5b48e6c6df0b4f52e8b0cadd465e09204df8bb3c 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -5,6 +5,7 @@
#include "content/renderer/gpu/render_widget_compositor.h"
#include <limits>
+#include <string>
#include "base/command_line.h"
#include "base/logging.h"
@@ -290,6 +291,11 @@ RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* 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;
@@ -521,16 +527,6 @@ void RenderWidgetCompositor::DidRecreateOutputSurface(bool 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();
}

Powered by Google App Engine
This is Rietveld 408576698