toggle FPS counter in compositor

webkit/compositor_bindings/WebLayerTreeViewImpl.cpp

Index: webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
diff --git a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
index f621a864a6eaeba69ae0c5454a520c03683eff9c..42a9ebe9214603df5ec3cca2bc2e118d4143a34c 100644
--- a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
@@ -35,6 +35,7 @@ WebLayerTreeView* WebLayerTreeView::create(WebLayerTreeViewClient* client, const
 
 WebLayerTreeViewImpl::WebLayerTreeViewImpl(WebLayerTreeViewClient* client)
     : m_client(client)
+    , m_hasFontAtlas(false)
 {
 }
 
@@ -46,7 +47,6 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
 {
     CCLayerTreeSettings settings;
     settings.acceleratePainting = webSettings.acceleratePainting;
-    settings.showFPSCounter = webSettings.showFPSCounter;
     settings.showPlatformLayerTree = webSettings.showPlatformLayerTree;
     settings.showPaintRects = webSettings.showPaintRects;
     settings.renderVSyncEnabled = webSettings.renderVSyncEnabled;
@@ -188,6 +188,7 @@ void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectT
         asciiToRectTable[i] = convert(asciiToWebRectTable[i]);
     scoped_ptr<CCFontAtlas> fontAtlas = CCFontAtlas::create(bitmap, asciiToRectTable, fontHeight);
     m_layerTreeHost->setFontAtlas(fontAtlas.Pass());
+    m_hasFontAtlas = true;
 }
 
 void WebLayerTreeViewImpl::loseCompositorContext(int numTimes)
@@ -195,6 +196,16 @@ void WebLayerTreeViewImpl::loseCompositorContext(int numTimes)
     m_layerTreeHost->loseContext(numTimes);
 }
 
+void WebLayerTreeViewImpl::setShowFPSCounter(bool show)
+{
+    m_layerTreeHost->setShowFPSCounter(show);
+}
+
+bool WebLayerTreeViewImpl::hasFontAtlas()
+{
+    return m_hasFontAtlas;
+}
+
 void WebLayerTreeViewImpl::willBeginFrame()
 {
     m_client->willBeginFrame();