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 4b64b1aa00ab261b4a7e227db29ff275c08bb43c..e3761f5bcafcbc6133167107d35bd0892d4600ca 100644 |
--- a/cc/heads_up_display_layer_impl.cc |
+++ b/cc/heads_up_display_layer_impl.cc |
@@ -146,14 +146,12 @@ void CCHeadsUpDisplayLayerImpl::drawHudContents(SkCanvas* canvas) |
int fpsCounterTop = 2; |
int platformLayerTreeTop; |
- if (settings.showFPSCounter) |
+ if (settings.showFPSCounter || layerTreeHostImpl()->showFPSCounter()) { |
brianderson
2012/10/18 00:13:21
How hard would it be to have the command-line flag
egraether
2012/10/18 15:56:30
It would be nice, but I think it's not a real prob
danakj
2012/10/18 16:45:07
I agree with Brian here, having a single point dec
|
+ 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()); |