Chromium Code Reviews| Index: cc/layer_tree_host.h |
| diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h |
| index 4405d586f47a17f146ff880c3aec6a993605308d..06f5669f3b93bcec8f4670f60cdc8a4ef756dce5 100644 |
| --- a/cc/layer_tree_host.h |
| +++ b/cc/layer_tree_host.h |
| @@ -52,7 +52,6 @@ struct CCLayerTreeSettings { |
| ~CCLayerTreeSettings(); |
| bool acceleratePainting; |
| - bool showFPSCounter; |
| bool showPlatformLayerTree; |
| bool showPaintRects; |
| bool showPropertyChangedRects; |
| @@ -67,7 +66,6 @@ struct CCLayerTreeSettings { |
| IntSize maxUntiledLayerSize; |
| IntSize minimumOcclusionTrackingSize; |
| - bool showDebugInfo() const { return showPlatformLayerTree || showFPSCounter || showDebugRects(); } |
|
danakj
2012/10/23 15:19:53
Can we keep this and just remove showFPSCounter fr
|
| bool showDebugRects() const { return showPaintRects || showPropertyChangedRects || showSurfaceDamageRects || showScreenSpaceRects || showReplicaScreenSpaceRects || showOccludingRects; } |
| }; |
| @@ -200,6 +198,7 @@ public: |
| void setDeviceScaleFactor(float); |
| float deviceScaleFactor() const { return m_deviceScaleFactor; } |
| + void setShowFPSCounter(bool show); |
| void setFontAtlas(scoped_ptr<CCFontAtlas>); |
| HeadsUpDisplayLayerChromium* hudLayer() const { return m_hudLayer.get(); } |
| @@ -228,6 +227,8 @@ private: |
| bool animateLayersRecursive(LayerChromium* current, double monotonicTime); |
| void setAnimationEventsRecursive(const CCAnimationEventsVector&, LayerChromium*, double wallClockTime); |
| + void createHUDLayerIfNeeded(); |
| + |
| bool m_animating; |
| bool m_needsAnimateLayers; |
| @@ -244,7 +245,6 @@ private: |
| scoped_refptr<LayerChromium> m_rootLayer; |
| scoped_refptr<HeadsUpDisplayLayerChromium> m_hudLayer; |
| - scoped_ptr<CCFontAtlas> m_fontAtlas; |
| scoped_ptr<CCPrioritizedTextureManager> m_contentsTextureManager; |
| scoped_ptr<CCPrioritizedTexture> m_surfaceMemoryPlaceholder; |