toggle FPS counter in compositor

cc/heads_up_display_layer.cc

Index: cc/heads_up_display_layer.cc
diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc
index 5e0439a94969692e96ea6494b2f97bab366525a6..0f7eddea16cebde3cf925b54d1b4cd353482cdf3 100644
--- a/cc/heads_up_display_layer.cc
+++ b/cc/heads_up_display_layer.cc
@@ -19,8 +19,9 @@ scoped_refptr<HeadsUpDisplayLayerChromium> HeadsUpDisplayLayerChromium::create()
 
 HeadsUpDisplayLayerChromium::HeadsUpDisplayLayerChromium()
     : LayerChromium()
+    , m_showFPSCounter(false)
+    , m_hasFontAtlas(false)
 {
-
     setBounds(IntSize(512, 128));
 }
 
@@ -50,9 +51,21 @@ bool HeadsUpDisplayLayerChromium::drawsContent() const
     return true;

[enne (OOO), 2012/10/24 18:35:27]

Maybe this should be hasFontAtlas()?

 }
 
+bool HeadsUpDisplayLayerChromium::hasFontAtlas() const
+{
+    return m_hasFontAtlas;
+}
+
 void HeadsUpDisplayLayerChromium::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas)
 {
     m_fontAtlas = fontAtlas.Pass();
+    m_hasFontAtlas = true;
+    setNeedsCommit();
+}
+
+void HeadsUpDisplayLayerChromium::setShowFPSCounter(bool show)
+{
+    m_showFPSCounter = show;

[enne (OOO), 2012/10/24 18:35:27]

Only setNeedsCommit if m_showFPSCounter changes value.

     setNeedsCommit();
 }
 
@@ -65,11 +78,11 @@ void HeadsUpDisplayLayerChromium::pushPropertiesTo(CCLayerImpl* layerImpl)
 {
     LayerChromium::pushPropertiesTo(layerImpl);
 
-    if (!m_fontAtlas.get())
-        return;
-
     CCHeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<CCHeadsUpDisplayLayerImpl*>(layerImpl);
-    hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
+    hudLayerImpl->setShowFPSCounter(m_showFPSCounter);
+
+    if (m_fontAtlas.get())
+        hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
 }
 
 }