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 a9702f34e8e4f5a1f09e77018ef89b5ccb385afa..95b05cf3e230a0a875d3514f0ff7eb2fb6e9c2ad 100644 |
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc |
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc |
@@ -37,9 +37,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; |
@@ -47,12 +44,13 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti |
settings.refreshRate = webSettings.refreshRate; |
settings.defaultTileSize = webSettings.defaultTileSize; |
settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize; |
+ settings.initialDebugState.showFPSCounter = webSettings.showFPSCounter; |
+ settings.initialDebugState.showPaintRects = webSettings.showPaintRects; |
+ settings.initialDebugState.showPlatformLayerTree = webSettings.showPlatformLayerTree; |
+ settings.initialDebugState.showDebugBorders = webSettings.showDebugBorders; |
m_layerTreeHost = LayerTreeHost::create(this, settings, implThread.Pass()); |
if (!m_layerTreeHost.get()) |
return false; |
- |
- if (webSettings.showFPSCounter) |
- setShowFPSCounter(true); |
return true; |
} |
@@ -179,7 +177,9 @@ void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const |
void WebLayerTreeViewImpl::setShowFPSCounter(bool show) |
{ |
- m_layerTreeHost->setShowFPSCounter(show); |
+ LayerTreeDebugState debugState = m_layerTreeHost->debugState(); |
+ debugState.showFPSCounter = show; |
+ m_layerTreeHost->setDebugState(debugState); |
} |
void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight) { |