toggle FPS counter in compositor

cc/heads_up_display_layer_impl.cc

Index: cc/heads_up_display_layer_impl.cc
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
index 381fff569178f1bd01fadcd38180f3e4fd87cad4..b451473452323229a19f8b37719e8b7b494096ca 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/heads_up_display_layer_impl.cc
@@ -43,6 +43,7 @@ static inline SkPaint createPaint()
 
 HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(int id)
     : LayerImpl(id)
+    , m_showFPSCounter(false)
 {
 }
 
@@ -55,6 +56,11 @@ void HeadsUpDisplayLayerImpl::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas)
     m_fontAtlas = fontAtlas.Pass();
 }
 
+void HeadsUpDisplayLayerImpl::setShowFPSCounter(bool show)
+{
+    m_showFPSCounter = show;
+}
+
 void HeadsUpDisplayLayerImpl::willDraw(ResourceProvider* resourceProvider)
 {
     LayerImpl::willDraw(resourceProvider);
@@ -147,14 +153,12 @@ void HeadsUpDisplayLayerImpl::drawHudContents(SkCanvas* canvas)
     int fpsCounterTop = 2;
     int platformLayerTreeTop;
 
-    if (settings.showFPSCounter)
+    if (m_showFPSCounter) {
+        drawFPSCounter(canvas, layerTreeHostImpl()->fpsCounter(), fpsCounterTop, fpsCounterHeight);
         platformLayerTreeTop = fpsCounterTop + fpsCounterHeight;
-    else
+    } else
         platformLayerTreeTop = 0;
 
-    if (settings.showFPSCounter)
-        drawFPSCounter(canvas, layerTreeHostImpl()->fpsCounter(), fpsCounterTop, fpsCounterHeight);
-
     if (settings.showPlatformLayerTree && m_fontAtlas.get()) {
         std::string layerTree = layerTreeHostImpl()->layerTreeAsText();
         m_fontAtlas->drawText(canvas, createPaint(), layerTree, gfx::Point(2, platformLayerTreeTop), bounds());