Index: cc/layer_tree_host.h |
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h |
index 1f589525ba007a67e3f70bf5a00ce7e617d44cca..cacf0e0699425e34d3c92b0dc9d09034708d7ec6 100644 |
--- a/cc/layer_tree_host.h |
+++ b/cc/layer_tree_host.h |
@@ -52,7 +52,6 @@ struct LayerTreeSettings { |
~LayerTreeSettings(); |
bool acceleratePainting; |
- bool showFPSCounter; |
bool showPlatformLayerTree; |
bool showPaintRects; |
bool showPropertyChangedRects; |
@@ -67,7 +66,6 @@ struct LayerTreeSettings { |
IntSize maxUntiledLayerSize; |
IntSize minimumOcclusionTrackingSize; |
- bool showDebugInfo() const { return showPlatformLayerTree || showFPSCounter || showDebugRects(); } |
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<FontAtlas>); |
HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); } |
@@ -228,6 +227,8 @@ private: |
bool animateLayersRecursive(Layer* current, double monotonicTime); |
void setAnimationEventsRecursive(const AnimationEventsVector&, Layer*, double wallClockTime); |
+ void createHUDLayerIfNeeded(); |
+ |
bool m_animating; |
bool m_needsAnimateLayers; |
@@ -244,7 +245,6 @@ private: |
scoped_refptr<Layer> m_rootLayer; |
scoped_refptr<HeadsUpDisplayLayer> m_hudLayer; |
- scoped_ptr<FontAtlas> m_fontAtlas; |
scoped_ptr<PrioritizedTextureManager> m_contentsTextureManager; |
scoped_ptr<PrioritizedTexture> m_surfaceMemoryPlaceholder; |