Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: cc/layer_tree_host.h

Issue 11189037: toggle FPS counter in compositor (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase to 166046 Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/heads_up_display_layer_impl.cc ('k') | cc/layer_tree_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host.h
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index 74e999b4b0db1b6141689bfce630ca399e3085e5..a0234df4c6cd41f492a47dcbbdaf1b477864e499 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -55,7 +55,6 @@ struct CC_EXPORT LayerTreeSettings {
~LayerTreeSettings();
bool acceleratePainting;
- bool showFPSCounter;
bool showPlatformLayerTree;
bool showPaintRects;
bool showPropertyChangedRects;
@@ -70,7 +69,7 @@ struct CC_EXPORT LayerTreeSettings {
gfx::Size maxUntiledLayerSize;
gfx::Size minimumOcclusionTrackingSize;
- bool showDebugInfo() const { return showPlatformLayerTree || showFPSCounter || showDebugRects(); }
+ bool showDebugInfo() const { return showPlatformLayerTree || showDebugRects(); }
bool showDebugRects() const { return showPaintRects || showPropertyChangedRects || showSurfaceDamageRects || showScreenSpaceRects || showReplicaScreenSpaceRects || showOccludingRects; }
};
@@ -208,6 +207,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(); }
@@ -237,6 +237,8 @@ private:
bool animateLayersRecursive(Layer* current, base::TimeTicks time);
void setAnimationEventsRecursive(const AnimationEventsVector&, Layer*, base::Time wallClockTime);
+ void createHUDLayerIfNeeded();
+
bool m_animating;
bool m_needsAnimateLayers;
@@ -255,7 +257,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;
« no previous file with comments | « cc/heads_up_display_layer_impl.cc ('k') | cc/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698