Skip to content

Commit

Permalink
Bug 1137109 move the displaylist tracing inside nsViewManager::Proces…
Browse files Browse the repository at this point in the history
…sPendingUpdates, r=benwa, mattwoodrow
howareyou322 committed Mar 3, 2015
1 parent 5ef7f7a commit 973e75b
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 0 additions & 2 deletions layout/base/nsRefreshDriver.cpp
Original file line number Diff line number Diff line change
@@ -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();
2 changes: 2 additions & 0 deletions view/nsViewManager.cpp
Original file line number Diff line number Diff line change
@@ -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);
}
}

0 comments on commit 973e75b

Please sign in to comment.