Index: cc/trees/layer_tree_host.h |
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h |
index d6bb16b88c45c1f449a5bcacf75fc2a03ac5043c..ca676a69f086ed5434573a40ad60a323668d9f9f 100644 |
--- a/cc/trees/layer_tree_host.h |
+++ b/cc/trees/layer_tree_host.h |
@@ -19,6 +19,7 @@ |
#include "cc/base/cc_export.h" |
#include "cc/base/scoped_ptr_vector.h" |
#include "cc/debug/latency_info.h" |
+#include "cc/input/input_handler.h" |
#include "cc/layers/layer_lists.h" |
#include "cc/output/output_surface.h" |
#include "cc/scheduler/rate_limiter.h" |
@@ -114,7 +115,6 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) { |
void WillCommit(); |
void CommitComplete(); |
scoped_ptr<OutputSurface> CreateOutputSurface(); |
- scoped_ptr<InputHandlerClient> CreateInputHandlerClient(); |
virtual scoped_ptr<LayerTreeHostImpl> CreateLayerTreeHostImpl( |
LayerTreeHostImplClient* client); |
void DidLoseOutputSurface(); |
@@ -135,6 +135,9 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) { |
size_t contents_memory_limit_bytes); |
LayerTreeHostClient* client() { return client_; } |
+ const base::WeakPtr<InputHandler>& GetInputHandler() { |
+ return input_handler_weak_ptr_; |
+ } |
void Composite(base::TimeTicks frame_begin_time); |
@@ -304,6 +307,7 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) { |
scoped_ptr<PrioritizedResourceManager> contents_texture_manager_; |
scoped_ptr<PrioritizedResource> surface_memory_placeholder_; |
+ base::WeakPtr<InputHandler> input_handler_weak_ptr_; |
base::WeakPtr<TopControlsManager> top_controls_manager_weak_ptr_; |
LayerTreeSettings settings_; |