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 dacc5fb1db68e914e5dee84913787d6a2a9835cd..7095ee9803d58fc88968b805f7b294d3bd91156d 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() |
HeadsUpDisplayLayerImpl::HeadsUpDisplayLayerImpl(int id) |
: LayerImpl(id) |
+ , m_showFPSCounter(false) |
{ |
} |
@@ -55,6 +56,11 @@ void HeadsUpDisplayLayerImpl::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas) |
m_fontAtlas = fontAtlas.Pass(); |
} |
+void HeadsUpDisplayLayerImpl::setShowFPSCounter(bool show) |
+{ |
+ m_showFPSCounter = show; |
+} |
+ |
void HeadsUpDisplayLayerImpl::willDraw(ResourceProvider* resourceProvider) |
{ |
LayerImpl::willDraw(resourceProvider); |
@@ -147,15 +153,15 @@ void HeadsUpDisplayLayerImpl::drawHudContents(SkCanvas* canvas) |
int fpsCounterTop = 2; |
int platformLayerTreeTop; |
- if (settings.showFPSCounter) |
+ if (m_showFPSCounter) { |
+ DCHECK(m_fontAtlas.get()); |
egraether
2012/10/25 02:01:11
I put DCHECKs in here, so that the fontAtlas still
|
+ 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()) { |
+ if (settings.showPlatformLayerTree) { |
+ DCHECK(m_fontAtlas.get()); |
std::string layerTree = layerTreeHostImpl()->layerTreeAsText(); |
m_fontAtlas->drawText(canvas, createPaint(), layerTree, gfx::Point(2, platformLayerTreeTop), bounds()); |
} |