Bug 1137109 move the displaylist tracing inside nsViewManager::ProcessPendingUpdates, r=benwa, mattwoodrow

This commit is contained in:
pchang 2015-02-26 17:58:30 +08:00
parent c1a51b0fe6
commit b9cb47edd5
2 changed files with 2 additions and 2 deletions

View File

@ -1696,7 +1696,6 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
profilingDocShells[i]->AddProfileTimelineMarker("Paint",
TRACING_INTERVAL_START);
}
profiler_tracing("Paint", "DisplayList", TRACING_INTERVAL_START);
#ifdef MOZ_DUMP_PAINTING
if (nsLayoutUtils::InvalidationDebuggingIsEnabled()) {
printf_stderr("Starting ProcessPendingUpdates\n");
@ -1715,7 +1714,6 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
profilingDocShells[i]->AddProfileTimelineMarker("Paint",
TRACING_INTERVAL_END);
}
profiler_tracing("Paint", "DisplayList", TRACING_INTERVAL_END);
if (nsContentUtils::XPConnect()) {
nsContentUtils::XPConnect()->NotifyDidPaint();

View File

@ -375,6 +375,7 @@ nsViewManager::ProcessPendingUpdatesForView(nsView* aView,
return; // 'this' might have been destroyed
}
if (aFlushDirtyRegion) {
profiler_tracing("Paint", "DisplayList", TRACING_INTERVAL_START);
nsAutoScriptBlocker scriptBlocker;
SetPainting(true);
for (uint32_t i = 0; i < widgets.Length(); ++i) {
@ -385,6 +386,7 @@ nsViewManager::ProcessPendingUpdatesForView(nsView* aView,
}
}
SetPainting(false);
profiler_tracing("Paint", "DisplayList", TRACING_INTERVAL_END);
}
}