Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(825)

Unified Diff: webkit/compositor_bindings/web_layer_tree_view_impl.cc

Issue 11189037: toggle FPS counter in compositor (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: plumbing 'showFPSCounter' through HUD, added 'createHUDLayerIfNeeded' Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0e27512b9587e0d0e8c8c20da06e2ab0b7f406bc..4b4e51ccae3fa63c1fa828a13c683565d8a5b6e4 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
@@ -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;
@@ -181,6 +181,16 @@ void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const
stats.numMainThreadScrolls = ccStats.numMainThreadScrolls;
}
+void WebLayerTreeViewImpl::setShowFPSCounter(bool show)
+{
+ m_layerTreeHost->setShowFPSCounter(show);
+}
+
+bool WebLayerTreeViewImpl::hasFontAtlas()
+{
+ return m_hasFontAtlas;
+}
+
void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight)
{
IntRect asciiToRectTable[128];
@@ -188,6 +198,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)

Powered by Google App Engine
This is Rietveld 408576698