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(); |
} |