toggle FPS counter in compositor

webkit/compositor_bindings/web_layer_tree_view_impl.cc

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 afa259e2cce9ee3f42eb0b6ed9079b9a3d92fca1..6fe24af51a075299b8a393b333a925e9bc7b0171 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
@@ -46,7 +46,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;
@@ -56,6 +55,9 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
     m_layerTreeHost = LayerTreeHost::create(this, settings);
     if (!m_layerTreeHost.get())
         return false;
+
+    if (webSettings.showFPSCounter)

[egraether, 2012/10/30 20:14:04]

This condition detects the commandline-flag set in the
WebLayerTreeView::Settings and calls setShowFPSCounter on the LayerTreeHost.
This is necessary for the --ui-show-fps-counter flag to work.

+        setShowFPSCounter(true);
     return true;
 }
 
@@ -188,6 +190,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)
 {
     IntRect asciiToRectTable[128];