cc: handling debug settings in new LayerTreeDebugState structure

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 "cc/heads_up_display_layer_impl.h"
 
 #include <limits>
 
 #include "base/stringprintf.h"
 #include "cc/debug_colors.h"
@@ skipping 31 matching lines @@
     paint.setColorFilter(new SkColorMatrixFilter(swizzleMatrix))->unref();
 
     return paint;
 }
 
 HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(int id)
     : LayerImpl(id)
     , m_averageFPS(0)
     , m_minFPS(0)
     , m_maxFPS(0)
-    , 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 = ScopedResource::create(resourceProvider);
 
     // FIXME: Scale the HUD by deviceScale to make it more friendly under high DPI.
 
     if (m_hudTexture->size() != bounds())
@@ skipping 63 matching lines @@
     m_hudTexture.reset();
 }
 
 bool HeadsUpDisplayLayerImpl::layerIsAlwaysDamaged() const
 {
     return true;
 }
 
 void HeadsUpDisplayLayerImpl::drawHudContents(SkCanvas* canvas)
 {
-    const LayerTreeSettings& settings = layerTreeHostImpl()->settings();
+    const LayerTreeDebugState& debugState = layerTreeHostImpl()->debugState();
 
-    if (settings.showPlatformLayerTree) {
+    if (debugState.showPlatformLayerTree) {
         SkPaint paint = createPaint();
         paint.setColor(SkColorSetARGB(192, 0, 0, 0));
         canvas->drawRect(SkRect::MakeXYWH(0, 0, bounds().width(), bounds().height()), paint);
     }
 
     int platformLayerTreeTop = 0;
 
-    if (m_showFPSCounter)
+    if (debugState.showFPSCounter)
         platformLayerTreeTop = drawFPSCounter(canvas, layerTreeHostImpl()->fpsCounter());
 
-    if (settings.showPlatformLayerTree && m_fontAtlas.get()) {
+    if (debugState.showPlatformLayerTree && m_fontAtlas) {
         std::string layerTree = layerTreeHostImpl()->layerTreeAsText();
         m_fontAtlas->drawText(canvas, createPaint(), layerTree, gfx::Point(2, platformLayerTreeTop), bounds());
     }
 
-    if (settings.showDebugRects())
+    if (debugState.showHudRects())
         drawDebugRects(canvas, layerTreeHostImpl()->debugRectHistory());
 }
 
 int HeadsUpDisplayLayerImpl::drawFPSCounter(SkCanvas* canvas, FrameRateCounter* fpsCounter)
 {
     const int padding = 4;
     const int gap = 6;
 
     const int fontHeight = m_fontAtlas.get() ? m_fontAtlas->fontHeight() : 0;
 
@@ skipping 191 matching lines @@
         canvas->drawRect(skRect, paint);
     }
 }
 
 const char* HeadsUpDisplayLayerImpl::layerTypeAsString() const
 {
     return "HeadsUpDisplayLayer";
 }
 
 }  // namespace cc