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..b4cdfab1f2c4ff82156f96c5e4596749f3a6197d 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; |
@@ -52,6 +51,10 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti |
if (webSettings.showFPSCounter) |
setShowFPSCounter(true); |
+ if (webSettings.showPaintRects) |
+ setShowPaintRects(true); |
+ if (webSettings.showPlatformLayerTree) |
+ setShowPlatformLayerTree(true); |
return true; |
} |
@@ -190,7 +193,17 @@ void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const |
void WebLayerTreeViewImpl::setShowFPSCounter(bool show) |
{ |
- m_layerTreeHost->setShowFPSCounter(show); |
+ m_layerTreeHost->requestHUDLayer()->setShowFPSCounter(show); |
egraether
2012/11/15 23:37:07
I tried to improve the pipeline here, by leaving o
|
+} |
+ |
+void WebLayerTreeViewImpl::setShowPaintRects(bool show) |
+{ |
+ m_layerTreeHost->requestHUDLayer()->setShowPaintRects(show); |
+} |
+ |
+void WebLayerTreeViewImpl::setShowPlatformLayerTree(bool show) |
+{ |
+ m_layerTreeHost->requestHUDLayer()->setShowPlatformLayerTree(show); |
} |
void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight) { |
@@ -203,7 +216,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) |