cc:: Add RenderingStatsInstrumentation to manage collection of RenderingStats

cc/layer_tree_host_impl.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYER_TREE_HOST_IMPL_H_
 #define CC_LAYER_TREE_HOST_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/animation_events.h"
 #include "cc/animation_registrar.h"
 #include "cc/cc_export.h"
 #include "cc/input_handler.h"
 #include "cc/output_surface_client.h"
 #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"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
 
 class CompletionEvent;
 class CompositorFrameMetadata;
 class DebugRectHistory;
 class FrameRateCounter;
 class LayerImpl;
 class LayerTreeHostImplTimeSourceAdapter;
 class LayerTreeImpl;
 class PageScaleAnimation;
 class PaintTimeCounter;
 class MemoryHistory;
 class RenderPassDrawQuad;
 class ResourceProvider;
 class TopControlsManager;
 struct RendererCapabilities;
-struct RenderingStats;
 
 // LayerTreeHost->Proxy callback interface.
 class LayerTreeHostImplClient {
 public:
     virtual void didLoseOutputSurfaceOnImplThread() = 0;
     virtual void onSwapBuffersCompleteOnImplThread() = 0;
     virtual void onVSyncParametersChanged(base::TimeTicks timebase, base::TimeDelta interval) = 0;
     virtual void onCanDrawStateChanged(bool canDraw) = 0;
     virtual void onHasPendingTreeStateChanged(bool hasPendingTree) = 0;
     virtual void setNeedsRedrawOnImplThread() = 0;
@@ skipping 11 matching lines @@
 
 // LayerTreeHostImpl owns the LayerImpl tree as well as associated rendering state
 class CC_EXPORT LayerTreeHostImpl : public InputHandlerClient,
                                     public RendererClient,
                                     public TileManagerClient,
                                     public OutputSurfaceClient,
                                     public TopControlsManagerClient {
     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
     virtual InputHandlerClient::ScrollStatus scrollBegin(gfx::Point, InputHandlerClient::ScrollInputType) OVERRIDE;
     virtual bool scrollBy(const gfx::Point&, const gfx::Vector2dF&) OVERRIDE;
     virtual void scrollEnd() OVERRIDE;
     virtual void pinchGestureBegin() OVERRIDE;
     virtual void pinchGestureUpdate(float, gfx::Point) OVERRIDE;
     virtual void pinchGestureEnd() OVERRIDE;
     virtual void startPageScaleAnimation(gfx::Vector2d targetOffset, bool anchorPoint, float pageScale, base::TimeTicks startTime, base::TimeDelta duration) OVERRIDE;
@@ skipping 105 matching lines @@
 
     float deviceScaleFactor() const { return m_deviceScaleFactor; }
     void setDeviceScaleFactor(float);
 
     scoped_ptr<ScrollAndScaleSet> processScrollDeltas();
 
     void startPageScaleAnimation(gfx::Vector2d targetOffset, bool useAnchor, float scale, base::TimeDelta duration);
 
     bool needsAnimateLayers() const { return !m_animationRegistrar->active_animation_controllers().empty(); }
 
-    void renderingStats(RenderingStats*) const;
-
     void sendManagedMemoryStats(
        size_t memoryVisibleBytes,
        size_t memoryVisibleAndNearbyBytes,
        size_t memoryUseBytes);
 
     FrameRateCounter* fpsCounter() const { return m_fpsCounter.get(); }
     PaintTimeCounter* paintTimeCounter() const { return m_paintTimeCounter.get(); }
     MemoryHistory* memoryHistory() const { return m_memoryHistory.get(); }
     DebugRectHistory* debugRectHistory() const { return m_debugRectHistory.get(); }
     ResourceProvider* resourceProvider() const { return m_resourceProvider.get(); }
@@ skipping 47 matching lines @@
     void beginNextFrame();
     base::TimeTicks currentFrameTime();
 
     scoped_ptr<base::Value> asValue() const;
     scoped_ptr<base::Value> activationStateAsValue() const;
     scoped_ptr<base::Value> frameStateAsValue() const;
 
     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 the tests. I already updated
the tests to show how this looks. Alternatively the recorder could also be
accessed via LayerTreeHostImplClient or Proxy, but I don't think that's cleaner.

     void activatePendingTree();
 
     // Virtual for testing.
     virtual void animateLayers(base::TimeTicks monotonicTime, base::Time wallClockTime);
     virtual void updateAnimationState();
 
     // Virtual for testing.
     virtual base::TimeDelta lowFrequencyAnimationInterval() const;
 
     const AnimationRegistrar::AnimationControllerMap& activeAnimationControllers() const { return m_animationRegistrar->active_animation_controllers(); }
@@ skipping 68 matching lines @@
     scoped_ptr<PageScaleAnimation> m_pageScaleAnimation;
 
     // This is used for ticking animations slowly when hidden.
     scoped_ptr<LayerTreeHostImplTimeSourceAdapter> m_timeSourceClientAdapter;
 
     scoped_ptr<FrameRateCounter> m_fpsCounter;
     scoped_ptr<PaintTimeCounter> m_paintTimeCounter;
     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;
 
     base::TimeTicks m_currentFrameTime;
 
     scoped_ptr<AnimationRegistrar> m_animationRegistrar;
 
+    RenderingStatsRecorder* m_renderingStatsRecorder;
+
     DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYER_TREE_HOST_IMPL_H_