toggle FPS counter in compositor

cc/heads_up_display_layer_impl.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/heads_up_display_layer_impl.h"
 
 #include "CCDebugRectHistory.h"
 #include "CCFontAtlas.h"
@@ skipping 25 matching lines @@
     swizzleMatrix.fMat[2 + 5 * 0] = 1;
     swizzleMatrix.fMat[3 + 5 * 3] = 1;
 
     SkPaint paint;
     paint.setColorFilter(new SkColorMatrixFilter(swizzleMatrix))->unref();
     return paint;
 }
 
 HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(int id)
     : LayerImpl(id)
+    , m_showFPSCounter(false)
 {
 }
 
 HeadsUpDisplayLayerImpl::~HeadsUpDisplayLayerImpl()
 {
 }
 
 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);
 
     if (!m_hudTexture)
         m_hudTexture = ScopedTexture::create(resourceProvider);
 
     // FIXME: Scale the HUD by deviceScale to make it more friendly under high DPI.
 
     if (m_hudTexture->size() != bounds())
@@ skipping 72 matching lines @@
     if (settings.showPlatformLayerTree) {
         SkPaint paint = createPaint();
         paint.setColor(SkColorSetARGB(192, 0, 0, 0));
         canvas->drawRect(SkRect::MakeXYWH(0, 0, bounds().width(), bounds().height()), paint);
     }
 
     int fpsCounterHeight = 40;
     int fpsCounterTop = 2;
     int platformLayerTreeTop;
 
-    if (settings.showFPSCounter)
+    if (m_showFPSCounter) {
+        DCHECK(m_fontAtlas.get());

[egraether, 2012/10/25 02:01:11]

I put DCHECKs in here, so that the fontAtlas still gets checked at one point.

+        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()) {
+    if (settings.showPlatformLayerTree) {
+        DCHECK(m_fontAtlas.get());
         std::string layerTree = layerTreeHostImpl()->layerTreeAsText();
         m_fontAtlas->drawText(canvas, createPaint(), layerTree, gfx::Point(2, platformLayerTreeTop), bounds());
     }
 
     if (settings.showDebugRects())
         drawDebugRects(canvas, layerTreeHostImpl()->debugRectHistory());
 }
 
 void HeadsUpDisplayLayerImpl::drawFPSCounter(SkCanvas* canvas, FrameRateCounter* fpsCounter, int top, int height)
 {
@@ skipping 119 matching lines @@
         canvas->drawRect(skRect, paint);
     }
 }
 
 const char* HeadsUpDisplayLayerImpl::layerTypeAsString() const
 {
     return "HeadsUpDisplayLayer";
 }
 
 }