toggle FPS counter in compositor

cc/layer_tree_host.cc

 // Copyright 2011 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 "CCLayerTreeHost.h"
 
 #include "CCFontAtlas.h"
 #include "CCGraphicsContext.h"
@@ skipping 20 matching lines @@
 namespace {
 static int numLayerTreeInstances;
 }
 
 namespace cc {
 
 bool CCLayerTreeHost::s_needsFilterContext = false;
 
 CCLayerTreeSettings::CCLayerTreeSettings()
     : acceleratePainting(false)
-    , showFPSCounter(false)
     , showPlatformLayerTree(false)
     , showPaintRects(false)
     , showPropertyChangedRects(false)
     , showSurfaceDamageRects(false)
     , showScreenSpaceRects(false)
     , showReplicaScreenSpaceRects(false)
     , showOccludingRects(false)
     , renderVSyncEnabled(true)
     , refreshRate(0)
     , maxPartialTextureUpdates(std::numeric_limits<size_t>::max())
@@ skipping 218 matching lines @@
     hostImpl->setSourceFrameNumber(commitNumber());
     hostImpl->setViewportSize(layoutViewportSize(), deviceViewportSize());
     hostImpl->setDeviceScaleFactor(deviceScaleFactor());
     hostImpl->setPageScaleFactorAndLimits(m_pageScaleFactor, m_minPageScaleFactor, m_maxPageScaleFactor);
     hostImpl->setBackgroundColor(m_backgroundColor);
     hostImpl->setHasTransparentBackground(m_hasTransparentBackground);
 
     m_commitNumber++;
 }
 
+void CCLayerTreeHost::setShowFPSCounter(bool show)
+{
+    createHUDLayerIfNeeded();
+    DCHECK(hasFontAtlas());
+    m_hudLayer->setShowFPSCounter(show);
+    setNeedsCommit();

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

You have multiple layers of setNeedsCommit here.  You should do this in one
place.  Probably on the layer itself.

+}
+
+bool CCLayerTreeHost::hasFontAtlas() const
+{
+    return m_hudLayer && m_hudLayer->hasFontAtlas();
+}
+
 void CCLayerTreeHost::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas)
 {
-    m_fontAtlas = fontAtlas.Pass();
+    createHUDLayerIfNeeded();

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

Why does this create the hud layer? What if none of the debug things are turned
on?

+    m_hudLayer->setFontAtlas(fontAtlas.Pass());
     setNeedsCommit();
 }
 
+void CCLayerTreeHost::createHUDLayerIfNeeded()
+{
+    if (!m_hudLayer)
+        m_hudLayer = HeadsUpDisplayLayerChromium::create();
+}
+
 void CCLayerTreeHost::willCommit()
 {
     m_client->willCommit();
-    if (m_rootLayer && m_settings.showDebugInfo()) {
-        if (!m_hudLayer)
-            m_hudLayer = HeadsUpDisplayLayerChromium::create();
 
-        if (m_fontAtlas.get())
-            m_hudLayer->setFontAtlas(m_fontAtlas.Pass());
+    if (m_settings.showDebugRects())
+        createHUDLayerIfNeeded();
 
-        if (!m_hudLayer->parent())
-            m_rootLayer->addChild(m_hudLayer);
-    }
+    if (m_settings.showPlatformLayerTree)
+        DCHECK(hasFontAtlas());

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

Maybe just move all the checks for the font atlas into createHUDLayerIfNeeded?

+
+    if (m_rootLayer && m_hudLayer && !m_hudLayer->parent())
+        m_rootLayer->addChild(m_hudLayer);
 }
 
 void CCLayerTreeHost::commitComplete()
 {
     m_deleteTextureAfterCommitList.clear();
     m_client->didCommit();
 }
 
 scoped_ptr<CCGraphicsContext> CCLayerTreeHost::createContext()
 {
@@ skipping 508 matching lines @@
             else
                 layer->notifyAnimationFinished(wallClockTime);
         }
     }
 
     for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIndex)
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
 } // namespace cc