| 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 02aa48b76291c603bff929dafa82b2ad8ef6c32a..731001f26567937ee6bd0c305c295a7259c5e7a7 100644
|
| --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| @@ -45,7 +45,6 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
|
| {
|
| LayerTreeSettings settings;
|
| settings.acceleratePainting = webSettings.acceleratePainting;
|
| - settings.showFPSCounter = webSettings.showFPSCounter;
|
| settings.showPlatformLayerTree = webSettings.showPlatformLayerTree;
|
| settings.showPaintRects = webSettings.showPaintRects;
|
| settings.renderVSyncEnabled = webSettings.renderVSyncEnabled;
|
| @@ -55,6 +54,9 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
|
| m_layerTreeHost = LayerTreeHost::create(this, settings);
|
| if (!m_layerTreeHost.get())
|
| return false;
|
| +
|
| + if (webSettings.showFPSCounter)
|
| + setShowFPSCounter(true);
|
| return true;
|
| }
|
|
|
| @@ -192,6 +194,11 @@ void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const
|
| stats.numMainThreadScrolls = ccStats.numMainThreadScrolls;
|
| }
|
|
|
| +void WebLayerTreeViewImpl::setShowFPSCounter(bool show)
|
| +{
|
| + m_layerTreeHost->setShowFPSCounter(show);
|
| +}
|
| +
|
| void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight) {
|
| setFontAtlas(asciiToWebRectTable, bitmap, fontHeight);
|
| }
|
|
|