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

Unified Diff: cc/trees/layer_tree_host.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: cc/trees/layer_tree_host.cc
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 726f9b5fc8c8cd2d81648db6d04eba17da7121a2..8545ca40201b8da4089b1d2235f2cd33e0281989 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -476,8 +476,8 @@ scoped_ptr<OutputSurface> LayerTreeHost::CreateOutputSurface() {
return client_->CreateOutputSurface();
}
-scoped_ptr<InputHandlerClient> LayerTreeHost::CreateInputHandlerClient() {
- return client_->CreateInputHandlerClient();
+const base::WeakPtr<InputHandler>& LayerTreeHost::GetInputHandler() {
danakj 2013/05/01 19:20:43 can this just be input_handler() inline in the hea
+ return input_handler_weak_ptr_;
}
scoped_ptr<LayerTreeHostImpl> LayerTreeHost::CreateLayerTreeHostImpl(
@@ -493,6 +493,7 @@ scoped_ptr<LayerTreeHostImpl> LayerTreeHost::CreateLayerTreeHostImpl(
top_controls_manager_weak_ptr_ =
host_impl->top_controls_manager()->AsWeakPtr();
}
+ input_handler_weak_ptr_ = host_impl->AsWeakPtr();
return host_impl.Pass();
}

Powered by Google App Engine
This is Rietveld 408576698