cc: handling debug settings in new LayerTreeDebugState structure

webkit/compositor_bindings/web_layer_tree_view_impl.cc

Index: webkit/compositor_bindings/web_layer_tree_view_impl.cc
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
index 571fadb3c2e851790606098f1249d170f2952db4..f03404806d2c90a8f4e55f5d740043cf64430fdb 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
@@ -36,9 +36,6 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
 {
     LayerTreeSettings settings;
     settings.acceleratePainting = webSettings.acceleratePainting;
-    settings.showDebugBorders = webSettings.showDebugBorders;
-    settings.showPlatformLayerTree = webSettings.showPlatformLayerTree;
-    settings.showPaintRects = webSettings.showPaintRects;
     settings.renderVSyncEnabled = webSettings.renderVSyncEnabled;
     settings.perTilePaintingEnabled = webSettings.perTilePaintingEnabled;
     settings.acceleratedAnimationEnabled = webSettings.acceleratedAnimationEnabled;
@@ -46,12 +43,13 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
     settings.refreshRate = webSettings.refreshRate;
     settings.defaultTileSize = webSettings.defaultTileSize;
     settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize;
+    settings.initialSwitchSettings.showFPSCounter = webSettings.showFPSCounter;
+    settings.initialSwitchSettings.showPaintRects = webSettings.showPaintRects;
+    settings.initialSwitchSettings.showPlatformLayerTree = webSettings.showPlatformLayerTree;
+    settings.initialSwitchSettings.showDebugBorders = webSettings.showDebugBorders;
     m_layerTreeHost = LayerTreeHost::create(this, settings, implThread.Pass());
     if (!m_layerTreeHost.get())
         return false;
-
-    if (webSettings.showFPSCounter)
-        setShowFPSCounter(true);
     return true;
 }
 
@@ -190,7 +188,16 @@ void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const
 
 void WebLayerTreeViewImpl::setShowFPSCounter(bool show)
 {
-    m_layerTreeHost->setShowFPSCounter(show);
+    LayerTreeSwitches switches = m_layerTreeHost->switches();
+    switches.showFPSCounter = show;
+    m_layerTreeHost->setSwitches(switches);
+}
+
+void WebLayerTreeViewImpl::setShowPaintRects(bool show)
+{
+    LayerTreeSwitches switches = m_layerTreeHost->switches();
+    switches.showPaintRects = show;
+    m_layerTreeHost->setSwitches(switches);
 }
 
 void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight) {