cc: handling debug settings in new LayerTreeDebugState structure

ui/compositor/compositor.cc

 // Copyright (c) 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 "ui/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 282 matching lines @@
       device_scale_factor_(0.0f),
       last_started_frame_(0),
       last_ended_frame_(0),
       disable_schedule_composite_(false),
       compositor_lock_(NULL) {
   root_web_layer_ = cc::Layer::create();
   root_web_layer_->setAnchorPoint(gfx::PointF(0.f, 0.f));
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   cc::LayerTreeSettings settings;
-  settings.showPlatformLayerTree =
+  settings.initialDebugState.showFPSCounter =
+      command_line->HasSwitch(switches::kUIShowFPSCounter);
+  settings.initialDebugState.showPlatformLayerTree =
       command_line->HasSwitch(switches::kUIShowLayerTree);
   settings.refreshRate =
       test_compositor_enabled ? kTestRefreshRate : kDefaultRefreshRate;
-  settings.showDebugBorders =
+  settings.initialDebugState.showDebugBorders =
       command_line->HasSwitch(switches::kUIShowLayerBorders);
   settings.partialSwapEnabled =
       command_line->HasSwitch(switches::kUIEnablePartialSwap);
   settings.perTilePaintingEnabled =
       command_line->HasSwitch(switches::kUIEnablePerTilePainting);
 
   scoped_ptr<cc::Thread> thread;
   if (g_compositor_thread) {
     thread = cc::ThreadImpl::createForDifferentThread(
         g_compositor_thread->message_loop_proxy());
   }
 
   host_ = cc::LayerTreeHost::create(this, settings, thread.Pass());
-  host_->setShowFPSCounter(
-      command_line->HasSwitch(switches::kUIShowFPSCounter));
   host_->setRootLayer(root_web_layer_);
   host_->setSurfaceReady();
 }
 
 Compositor::~Compositor() {
   CancelCompositorLock();
   DCHECK(!compositor_lock_);
 
   // Don't call |CompositorDelegate::ScheduleDraw| from this point.
   delegate_ = NULL;
@@ skipping 259 matching lines @@
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return test_compositor_enabled;
 }
 
 }  // namespace ui