| Index: cc/heads_up_display_layer_impl.cc
|
| diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
|
| index 1c7499eb6f1ffe643025cb78cc9b8f04d51f4fcb..0ff088c024a81446d14a646da815fa68c08ef1e5 100644
|
| --- a/cc/heads_up_display_layer_impl.cc
|
| +++ b/cc/heads_up_display_layer_impl.cc
|
| @@ -43,6 +43,7 @@ static inline SkPaint createPaint()
|
|
|
| CCHeadsUpDisplayLayerImpl::CCHeadsUpDisplayLayerImpl(int id)
|
| : CCLayerImpl(id)
|
| + , m_showFPSCounter(false)
|
| {
|
| }
|
|
|
| @@ -55,6 +56,11 @@ void CCHeadsUpDisplayLayerImpl::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas)
|
| m_fontAtlas = fontAtlas.Pass();
|
| }
|
|
|
| +void CCHeadsUpDisplayLayerImpl::setShowFPSCounter(bool show)
|
| +{
|
| + m_showFPSCounter = show;
|
| +}
|
| +
|
| void CCHeadsUpDisplayLayerImpl::willDraw(CCResourceProvider* resourceProvider)
|
| {
|
| CCLayerImpl::willDraw(resourceProvider);
|
| @@ -147,14 +153,12 @@ void CCHeadsUpDisplayLayerImpl::drawHudContents(SkCanvas* canvas)
|
| int fpsCounterTop = 2;
|
| int platformLayerTreeTop;
|
|
|
| - if (settings.showFPSCounter)
|
| + if (m_showFPSCounter) {
|
| + drawFPSCounter(canvas, layerTreeHostImpl()->fpsCounter(), fpsCounterTop, fpsCounterHeight);
|
| platformLayerTreeTop = fpsCounterTop + fpsCounterHeight;
|
| - else
|
| + } else
|
| platformLayerTreeTop = 0;
|
|
|
| - if (settings.showFPSCounter)
|
| - drawFPSCounter(canvas, layerTreeHostImpl()->fpsCounter(), fpsCounterTop, fpsCounterHeight);
|
| -
|
| if (settings.showPlatformLayerTree && m_fontAtlas.get()) {
|
| std::string layerTree = layerTreeHostImpl()->layerTreeAsText();
|
| m_fontAtlas->drawText(canvas, createPaint(), layerTree, gfx::Point(2, platformLayerTreeTop), bounds());
|
|
|