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

Unified Diff: cc/heads_up_display_layer.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: cc/heads_up_display_layer.cc
diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc
index 5e0439a94969692e96ea6494b2f97bab366525a6..7e765be3dc3ba8a479b2ddda35705d446d8c8590 100644
--- a/cc/heads_up_display_layer.cc
+++ b/cc/heads_up_display_layer.cc
@@ -19,8 +19,8 @@ scoped_refptr<HeadsUpDisplayLayerChromium> HeadsUpDisplayLayerChromium::create()
HeadsUpDisplayLayerChromium::HeadsUpDisplayLayerChromium()
: LayerChromium()
+ , m_showFPSCounter(false)
{
-
setBounds(IntSize(512, 128));
}
@@ -56,6 +56,12 @@ void HeadsUpDisplayLayerChromium::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas
setNeedsCommit();
}
+void HeadsUpDisplayLayerChromium::setShowFPSCounter(bool show)
+{
+ m_showFPSCounter = show;
+ setNeedsCommit();
+}
+
scoped_ptr<CCLayerImpl> HeadsUpDisplayLayerChromium::createCCLayerImpl()
{
return CCHeadsUpDisplayLayerImpl::create(m_layerId).PassAs<CCLayerImpl>();
@@ -65,11 +71,11 @@ void HeadsUpDisplayLayerChromium::pushPropertiesTo(CCLayerImpl* layerImpl)
{
LayerChromium::pushPropertiesTo(layerImpl);
- if (!m_fontAtlas.get())
- return;
-
CCHeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<CCHeadsUpDisplayLayerImpl*>(layerImpl);
- hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
+ hudLayerImpl->setShowFPSCounter(m_showFPSCounter);
+
+ if (m_fontAtlas.get())
+ hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
}
}

Powered by Google App Engine
This is Rietveld 408576698