cc: handling debug settings in new LayerTreeDebugState structure

cc/heads_up_display_layer.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 "cc/heads_up_display_layer.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/heads_up_display_layer_impl.h"
 #include "cc/layer_tree_host.h"
 
 namespace cc {
 
 scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::create()
 {
     return make_scoped_refptr(new HeadsUpDisplayLayer());
 }
 
 HeadsUpDisplayLayer::HeadsUpDisplayLayer()
     : Layer()
-    , m_showFPSCounter(false)
 {
     setBounds(gfx::Size(256, 128));
 }
 
 HeadsUpDisplayLayer::~HeadsUpDisplayLayer()
 {
 }
 
 void HeadsUpDisplayLayer::update(ResourceUpdateQueue&, const OcclusionTracker*, RenderingStats&)
 {
-    const LayerTreeSettings& settings = layerTreeHost()->settings();
+    const LayerTreeDebugState& debugState = layerTreeHost()->debugState();
     int maxTextureSize = layerTreeHost()->rendererCapabilities().maxTextureSize;
 
     gfx::Size bounds;
     gfx::Transform matrix;
     matrix.MakeIdentity();
 
-    if (settings.showPlatformLayerTree || settings.showDebugRects()) {
+    if (debugState.showPlatformLayerTree || debugState.showHudRects()) {
         int width = std::min(maxTextureSize, layerTreeHost()->deviceViewportSize().width());
         int height = std::min(maxTextureSize, layerTreeHost()->deviceViewportSize().height());
         bounds = gfx::Size(width, height);
     } else {
         bounds = gfx::Size(256, 128);
         matrix.Translate(layerTreeHost()->deviceViewportSize().width() - 256, 0);
     }
 
     setBounds(bounds);
     setTransform(matrix);
 }
 
 bool HeadsUpDisplayLayer::drawsContent() const
 {
     return true;
 }
 
 void HeadsUpDisplayLayer::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas)
 {
     m_fontAtlas = fontAtlas.Pass();
     setNeedsCommit();
 }
 
-void HeadsUpDisplayLayer::setShowFPSCounter(bool show)
-{
-    m_showFPSCounter = show;
-    setNeedsCommit();
-}
-
 scoped_ptr<LayerImpl> HeadsUpDisplayLayer::createLayerImpl()
 {
     return HeadsUpDisplayLayerImpl::create(m_layerId).PassAs<LayerImpl>();
 }
 
 void HeadsUpDisplayLayer::pushPropertiesTo(LayerImpl* layerImpl)
 {
     Layer::pushPropertiesTo(layerImpl);
 
-    HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl*>(layerImpl);
-    hudLayerImpl->setShowFPSCounter(m_showFPSCounter);
-
-    if (m_fontAtlas.get())
+    if (m_fontAtlas.get()) {

[danakj, 2012/11/27 20:23:15]

instead of nesting here, just early-out when (!m_fontAtlas)

.get() is redundant also :)

+        HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl*>(layerImpl);
         hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
+    }
 }
 
 }  // namespace cc