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..2a38ca5f05bdb9b6e5f8892f43002339dcb1c413 100644 |
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc |
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc |
@@ -5,6 +5,7 @@ |
#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" |
@@ -37,8 +38,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 +45,12 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti |
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; |
} |
@@ -190,7 +189,16 @@ void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const |
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) { |
@@ -203,7 +211,7 @@ void WebLayerTreeViewImpl::setFontAtlas(WebRect asciiToWebRectTable[128], const |
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) |