cc: handling debug settings in new LayerTreeDebugState structure

webkit/compositor_bindings/web_layer_tree_view_impl.cc

 // Copyright 2011 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 "web_layer_tree_view_impl.h"
 
 #include "cc/font_atlas.h"
+#include "cc/heads_up_display_layer.h"
 #include "cc/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_tree_host.h"
 #include "cc/thread.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandler.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"
@@ skipping 12 matching lines @@
 
 WebLayerTreeViewImpl::~WebLayerTreeViewImpl()
 {
 }
 
 bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSettings, scoped_ptr<Thread> implThread)
 {
     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;
     settings.pageScalePinchZoomEnabled = webSettings.pageScalePinchZoomEnabled;
     settings.refreshRate = webSettings.refreshRate;
     settings.defaultTileSize = webSettings.defaultTileSize;
     settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize;
+    settings.globalHudLayerSettings.showFPSCounter = webSettings.showFPSCounter;
+    settings.globalHudLayerSettings.showPaintRects = webSettings.showPaintRects;
+    settings.globalHudLayerSettings.showPlatformLayerTree = webSettings.showPlatformLayerTree;
     m_layerTreeHost = LayerTreeHost::create(this, settings, implThread.Pass());
     if (!m_layerTreeHost.get())
         return false;
-
-    if (webSettings.showFPSCounter)
-        setShowFPSCounter(true);
     return true;
 }
 
 void WebLayerTreeViewImpl::setSurfaceReady()
 {
     m_layerTreeHost->setSurfaceReady();
 }
 
 void WebLayerTreeViewImpl::setRootLayer(const WebLayer& root)
 {
@@ skipping 118 matching lines @@
     stats.totalCommitTimeInSeconds = ccStats.totalCommitTimeInSeconds;
     stats.totalCommitCount = ccStats.totalCommitCount;
     stats.totalPixelsPainted = ccStats.totalPixelsPainted;
     stats.totalPixelsRasterized = ccStats.totalPixelsRasterized;
     stats.numImplThreadScrolls = ccStats.numImplThreadScrolls;
     stats.numMainThreadScrolls = ccStats.numMainThreadScrolls;
 }
 
 void WebLayerTreeViewImpl::setShowFPSCounter(bool show)
 {
-    m_layerTreeHost->setShowFPSCounter(show);
+    HeadsUpDisplayLayerSettings settings(m_layerTreeHost->hudLayerSettings());
+    settings.showFPSCounter = show;
+    m_layerTreeHost->setHudLayerSettings(settings);
+}
+
+void WebLayerTreeViewImpl::setShowPaintRects(bool show)
+{
+    HeadsUpDisplayLayerSettings settings(m_layerTreeHost->hudLayerSettings());
+    settings.showPaintRects = show;
+    m_layerTreeHost->setHudLayerSettings(settings);
 }
 
 void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight) {
     setFontAtlas(asciiToWebRectTable, bitmap, fontHeight);
 }
 
 void WebLayerTreeViewImpl::setFontAtlas(WebRect asciiToWebRectTable[128], const SkBitmap& bitmap, int fontHeight)
 {
     gfx::Rect asciiToRectTable[128];
     for (int i = 0; i < 128; ++i)
         asciiToRectTable[i] = asciiToWebRectTable[i];
     scoped_ptr<FontAtlas> fontAtlas = FontAtlas::create(bitmap, asciiToRectTable, fontHeight);
-    m_layerTreeHost->setFontAtlas(fontAtlas.Pass());
+    m_layerTreeHost->requestHudLayer()->setFontAtlas(fontAtlas.Pass());
 }
 
 void WebLayerTreeViewImpl::loseCompositorContext(int numTimes)
 {
     m_layerTreeHost->loseContext(numTimes);
 }
 
 void WebLayerTreeViewImpl::willBeginFrame()
 {
     m_client->willBeginFrame();
@@ skipping 57 matching lines @@
 {
     m_client->didCompleteSwapBuffers();
 }
 
 void WebLayerTreeViewImpl::scheduleComposite()
 {
     m_client->scheduleComposite();
 }
 
 } // namespace WebKit