Chromium Code Reviews| Index: cc/layer_tree_host_impl.h |
| diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h |
| index 81097e367951f3eb68fa0380cd8797c4deca53c6..cf2030dd055a847797c3236261c63618524ba23f 100644 |
| --- a/cc/layer_tree_host_impl.h |
| +++ b/cc/layer_tree_host_impl.h |
| @@ -16,6 +16,7 @@ |
| #include "cc/render_pass.h" |
| #include "cc/render_pass_sink.h" |
| #include "cc/renderer.h" |
| +#include "cc/rendering_stats_recorder.h" |
| #include "cc/tile_manager.h" |
| #include "cc/top_controls_manager_client.h" |
| #include "skia/ext/refptr.h" |
| @@ -39,7 +40,6 @@ class RenderPassDrawQuad; |
| class ResourceProvider; |
| class TopControlsManager; |
| struct RendererCapabilities; |
| -struct RenderingStats; |
| // LayerTreeHost->Proxy callback interface. |
| class LayerTreeHostImplClient { |
| @@ -71,7 +71,7 @@ class CC_EXPORT LayerTreeHostImpl : public InputHandlerClient, |
| typedef std::vector<LayerImpl*> LayerList; |
| public: |
| - static scoped_ptr<LayerTreeHostImpl> create(const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*); |
| + static scoped_ptr<LayerTreeHostImpl> create(const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*, RenderingStatsRecorder*); |
| virtual ~LayerTreeHostImpl(); |
| // InputHandlerClient implementation |
| @@ -197,8 +197,6 @@ public: |
| bool needsAnimateLayers() const { return !m_animationRegistrar->active_animation_controllers().empty(); } |
| - void renderingStats(RenderingStats*) const; |
| - |
| void sendManagedMemoryStats( |
| size_t memoryVisibleBytes, |
| size_t memoryVisibleAndNearbyBytes, |
| @@ -266,7 +264,7 @@ public: |
| bool pageScaleAnimationActive() const { return !!m_pageScaleAnimation; } |
| protected: |
| - LayerTreeHostImpl(const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*); |
| + LayerTreeHostImpl(const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*, RenderingStatsRecorder*); |
|
egraether
2013/03/12 19:31:42
Passing to the constructor needs more changes in t
|
| void activatePendingTree(); |
| // Virtual for testing. |
| @@ -355,13 +353,6 @@ private: |
| scoped_ptr<MemoryHistory> m_memoryHistory; |
| scoped_ptr<DebugRectHistory> m_debugRectHistory; |
| - int64 m_numImplThreadScrolls; |
| - int64 m_numMainThreadScrolls; |
| - |
| - int64 m_cumulativeNumLayersDrawn; |
| - |
| - int64 m_cumulativeNumMissingTiles; |
| - |
| size_t m_lastSentMemoryVisibleBytes; |
| size_t m_lastSentMemoryVisibleAndNearbyBytes; |
| size_t m_lastSentMemoryUseBytes; |
| @@ -370,6 +361,8 @@ private: |
| scoped_ptr<AnimationRegistrar> m_animationRegistrar; |
| + RenderingStatsRecorder* m_renderingStatsRecorder; |
| + |
| DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); |
| }; |