cc: handling debug settings in new LayerTreeDebugState structure

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 "cc/layer_tree_host.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
-#include "cc/font_atlas.h"
 #include "cc/graphics_context.h"
 #include "cc/heads_up_display_layer.h"
 #include "cc/heads_up_display_layer_impl.h"
 #include "cc/layer.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_iterator.h"
 #include "cc/layer_tree_host_client.h"
 #include "cc/layer_tree_host_common.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/math_util.h"
@@ skipping 10 matching lines @@
 namespace {
 static int numLayerTreeInstances;
 }
 
 namespace cc {
 
 bool LayerTreeHost::s_needsFilterContext = false;
 
 LayerTreeSettings::LayerTreeSettings()
     : acceleratePainting(false)
-    , showDebugBorders(false)
-    , showPlatformLayerTree(false)
-    , showPaintRects(false)
-    , showPropertyChangedRects(false)
-    , showSurfaceDamageRects(false)
-    , showScreenSpaceRects(false)
-    , showReplicaScreenSpaceRects(false)
-    , showOccludingRects(false)
-    , showNonOccludingRects(false)
     , renderVSyncEnabled(true)
     , perTilePaintingEnabled(false)
     , partialSwapEnabled(false)
     , acceleratedAnimationEnabled(true)
     , pageScalePinchZoomEnabled(false)
     , backgroundColorInsteadOfCheckerboard(false)
     , showOverdrawInTracing(false)
     , refreshRate(0)
     , maxPartialTextureUpdates(std::numeric_limits<size_t>::max())
     , defaultTileSize(gfx::Size(256, 256))
     , maxUntiledLayerSize(gfx::Size(512, 512))
     , minimumOcclusionTrackingSize(gfx::Size(160, 160))
 {
     // TODO(danakj): Move this to chromium when we don't go through the WebKit API anymore.
-    showPropertyChangedRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowPropertyChangedRects);
-    showSurfaceDamageRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowSurfaceDamageRects);
-    showScreenSpaceRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowScreenSpaceRects);
-    showReplicaScreenSpaceRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowReplicaScreenSpaceRects);
-    showOccludingRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowOccludingRects);
-    showNonOccludingRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowNonOccludingRects);
     partialSwapEnabled = CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePartialSwap);
     backgroundColorInsteadOfCheckerboard = CommandLine::ForCurrentProcess()->HasSwitch(switches::kBackgroundColorInsteadOfCheckerboard);
     showOverdrawInTracing = CommandLine::ForCurrentProcess()->HasSwitch(switches::kTraceOverdraw);
+
+    globalHudLayerSettings.showPropertyChangedRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowPropertyChangedRects);
+    globalHudLayerSettings.showSurfaceDamageRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowSurfaceDamageRects);
+    globalHudLayerSettings.showScreenSpaceRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowScreenSpaceRects);
+    globalHudLayerSettings.showReplicaScreenSpaceRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowReplicaScreenSpaceRects);
+    globalHudLayerSettings.showOccludingRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowOccludingRects);
+    globalHudLayerSettings.showNonOccludingRects = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kShowNonOccludingRects);
 }
 
 LayerTreeSettings::~LayerTreeSettings()
 {
 }
 
 RendererCapabilities::RendererCapabilities()
     : bestTextureFormat(0)
     , contextHasCachedFrontBuffer(false)
     , usingPartialSwap(false)
@@ skipping 202 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 LayerTreeHost::createHUDLayerIfNeeded()
-{
-    if (!m_hudLayer)
-        m_hudLayer = HeadsUpDisplayLayer::create();
-}
-
-void LayerTreeHost::setShowFPSCounter(bool show)
-{
-    createHUDLayerIfNeeded();
-    m_hudLayer->setShowFPSCounter(show);
-}
-
-void LayerTreeHost::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas)
-{
-    createHUDLayerIfNeeded();
-    m_hudLayer->setFontAtlas(fontAtlas.Pass());
-}
-
 void LayerTreeHost::willCommit()
 {
     m_client->willCommit();
 
-    if (m_settings.showDebugInfo())
-        createHUDLayerIfNeeded();
+    HeadsUpDisplayLayerSettings settings = m_settings.globalHudLayerSettings.merge(m_localHUDLayerSettings);

[egraether, 2012/11/20 21:30:30]

or'ing global and local settings

 
-    if (m_rootLayer && m_hudLayer && !m_hudLayer->parent())
-        m_rootLayer->addChild(m_hudLayer);
+    if (settings.showDebugInfo())
+        requestHudLayer();
+
+    if (m_hudLayer) {
+        m_hudLayer->setSettings(settings);
+
+        if (m_rootLayer && !m_hudLayer->parent())
+            m_rootLayer->addChild(m_hudLayer);
+    }
 }
 
 void LayerTreeHost::commitComplete()
 {
     m_client->didCommit();
 }
 
 scoped_ptr<GraphicsContext> LayerTreeHost::createContext()
 {
     return m_client->createOutputSurface();
@@ skipping 473 matching lines @@
 
 void LayerTreeHost::setDeviceScaleFactor(float deviceScaleFactor)
 {
     if (deviceScaleFactor ==  m_deviceScaleFactor)
         return;
     m_deviceScaleFactor = deviceScaleFactor;
 
     setNeedsCommit();
 }
 
+HeadsUpDisplayLayer* LayerTreeHost::requestHudLayer()
+{
+    if (!m_hudLayer.get())
+        m_hudLayer = HeadsUpDisplayLayer::create();
+
+    return m_hudLayer.get();
+}
+
+void LayerTreeHost::setHudLayerSettings(const HeadsUpDisplayLayerSettings& settings)
+{
+    m_localHUDLayerSettings = settings;
+    setNeedsCommit();
+}
+
 void LayerTreeHost::animateLayers(base::TimeTicks time)
 {
     if (!m_settings.acceleratedAnimationEnabled || !m_needsAnimateLayers)
         return;
 
     TRACE_EVENT0("cc", "LayerTreeHostImpl::animateLayers");
     m_needsAnimateLayers = animateLayersRecursive(m_rootLayer.get(), time);
 }
 
 bool LayerTreeHost::animateLayersRecursive(Layer* current, base::TimeTicks time)
@@ skipping 30 matching lines @@
             else
                 layer->notifyAnimationFinished(wallClockTime.ToDoubleT());
         }
     }
 
     for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIndex)
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
 }  // namespace cc