summaryrefslogtreecommitdiffstats
path: root/cc/layer_tree_host.cc
diff options
context:
space:
mode:
authoregraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 23:10:08 +0000
committeregraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 23:10:08 +0000
commit90f52dcaaa23401ab60bbb7f689d98c73aa04f09 (patch)
tree54d613c9fe014d08a8a34db42cb8d8aaa8100932 /cc/layer_tree_host.cc
parent7aad021400abc8e5495c333f77e06b73bddbb722 (diff)
downloadchromium_src-90f52dcaaa23401ab60bbb7f689d98c73aa04f09.zip
chromium_src-90f52dcaaa23401ab60bbb7f689d98c73aa04f09.tar.gz
chromium_src-90f52dcaaa23401ab60bbb7f689d98c73aa04f09.tar.bz2
cc: Fix paint time collection for continuous painting mode
This change moves the recordRenderingStats setting to LayerTreeDebugState and adds the new accessor LayerTreeDebugState::recordRenderingStats() that takes continuousPainting into account. BUG=174354 Review URL: https://chromiumcodereview.appspot.com/12209018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_tree_host.cc')
-rw-r--r--cc/layer_tree_host.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index cc08d55..3af415a 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -406,7 +406,7 @@ void LayerTreeHost::didDeferCommit()
void LayerTreeHost::renderingStats(RenderingStats* stats) const
{
- CHECK(m_settings.recordRenderingStats);
+ CHECK(m_debugState.recordRenderingStats());
*stats = m_renderingStats;
m_proxy->renderingStats(stats);
}
@@ -697,7 +697,7 @@ bool LayerTreeHost::paintMasksForRenderSurface(Layer* renderSurfaceLayer, Resour
// in code, we already know that at least something will be drawn into this render surface, so the
// mask and replica should be painted.
- RenderingStats* stats = m_settings.recordRenderingStats ? &m_renderingStats : NULL;
+ RenderingStats* stats = m_debugState.recordRenderingStats() ? &m_renderingStats : NULL;
bool needMoreUpdates = false;
Layer* maskLayer = renderSurfaceLayer->maskLayer();
@@ -726,7 +726,7 @@ bool LayerTreeHost::paintLayerContents(const LayerList& renderSurfaceLayerList,
prioritizeTextures(renderSurfaceLayerList, occlusionTracker.overdrawMetrics());
- RenderingStats* stats = m_settings.recordRenderingStats ? &m_renderingStats : NULL;
+ RenderingStats* stats = m_debugState.recordRenderingStats() ? &m_renderingStats : NULL;
LayerIteratorType end = LayerIteratorType::end(&renderSurfaceLayerList);
for (LayerIteratorType it = LayerIteratorType::begin(&renderSurfaceLayerList); it != end; ++it) {