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 51 matching lines @@
     , m_settings(settings)
     , m_deviceScaleFactor(1)
     , m_visible(true)
     , m_pageScaleFactor(1)
     , m_minPageScaleFactor(1)
     , m_maxPageScaleFactor(1)
     , m_triggerIdleUpdates(true)
     , m_backgroundColor(SK_ColorWHITE)
     , m_hasTransparentBackground(false)
     , m_partialTextureUpdateRequests(0)
+    , m_showFPSCounter(false)
 {
     ASSERT(CCProxy::isMainThread());
     numLayerTreeInstances++;
 }
 
 bool CCLayerTreeHost::initialize()
 {
     TRACE_EVENT0("cc", "CCLayerTreeHost::initialize");
 
     if (CCProxy::hasImplThread())
@@ skipping 147 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)
+{
+    m_showFPSCounter = show;
+    m_proxy->setShowFPSCounter(show);

[nduca, 2012/10/20 19:49:41]

so what happens if you set the atlas, then call setShowFPSCounter? How does the
m_hudLayer get created? This seems very fragile. Please refactor setShowFPS and
setFontAtlas so that they call createHUDLayerIfNeeded().

+}
+
 void CCLayerTreeHost::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas)
 {
     m_fontAtlas = fontAtlas.Pass();
     setNeedsCommit();
 }
 
 void CCLayerTreeHost::willCommit()
 {
     m_client->willCommit();
-    if (m_rootLayer && m_settings.showDebugInfo()) {
+    if (m_rootLayer && (m_settings.showDebugInfo() || m_showFPSCounter)) {
         if (!m_hudLayer)
             m_hudLayer = HeadsUpDisplayLayerChromium::create();
 
         if (m_fontAtlas.get())
             m_hudLayer->setFontAtlas(m_fontAtlas.Pass());
 
         if (!m_hudLayer->parent())
             m_rootLayer->addChild(m_hudLayer);
     }
 }
@@ skipping 517 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