cc: handling debug settings in new LayerTreeDebugState structure

cc/heads_up_display_layer_impl.cc

Index: cc/heads_up_display_layer_impl.cc
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
index 4faf68246e7f44d88531ae0cb8c19aa6f1bad2c6..36d0457e9290fc10839af4ae7a591dea7f591951 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/heads_up_display_layer_impl.cc
@@ -49,7 +49,6 @@ HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(int id)
     , m_averageFPS(0)
     , m_minFPS(0)
     , m_maxFPS(0)
-    , m_showFPSCounter(false)
 {
 }
 
@@ -62,11 +61,6 @@ 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);
@@ -150,9 +144,9 @@ bool HeadsUpDisplayLayerImpl::layerIsAlwaysDamaged() const
 
 void HeadsUpDisplayLayerImpl::drawHudContents(SkCanvas* canvas)
 {
-    const LayerTreeSettings& settings = layerTreeHostImpl()->settings();
+    const LayerTreeSwitches& switches = layerTreeHostImpl()->switches();
 
-    if (settings.showPlatformLayerTree) {
+    if (switches.showPlatformLayerTree) {
         SkPaint paint = createPaint();
         paint.setColor(SkColorSetARGB(192, 0, 0, 0));
         canvas->drawRect(SkRect::MakeXYWH(0, 0, bounds().width(), bounds().height()), paint);
@@ -160,15 +154,15 @@ void HeadsUpDisplayLayerImpl::drawHudContents(SkCanvas* canvas)
 
     int platformLayerTreeTop = 0;
 
-    if (m_showFPSCounter)
+    if (switches.showFPSCounter)
         platformLayerTreeTop = drawFPSCounter(canvas, layerTreeHostImpl()->fpsCounter());
 
-    if (settings.showPlatformLayerTree && m_fontAtlas.get()) {
+    if (switches.showPlatformLayerTree && m_fontAtlas.get()) {
         std::string layerTree = layerTreeHostImpl()->layerTreeAsText();
         m_fontAtlas->drawText(canvas, createPaint(), layerTree, gfx::Point(2, platformLayerTreeTop), bounds());
     }
 
-    if (settings.showDebugRects())
+    if (switches.showHudRects())
         drawDebugRects(canvas, layerTreeHostImpl()->debugRectHistory());
 }