Bug 1437316 - Move the profiler marker from DoFlushPendingNotifications to inner DoReflow method r=mstange

Depends on D4943

Differential Revision: https://phabricator.services.mozilla.com/D4945

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nazım Can Altınova 2018-09-13 20:30:21 +00:00
Родитель f0ce9c885a
Коммит 4941cf846b
1 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -4342,11 +4342,6 @@ PresShell::DoFlushPendingNotifications(mozilla::ChangesToFlush aFlush)
? FlushType::Layout
: FlushType::InterruptibleLayout) &&
!mIsDestroying) {
#ifdef MOZ_GECKO_PROFILER
AutoProfilerTracing tracingLayoutFlush("Paint", "Reflow",
std::move(mReflowCause));
mReflowCause = nullptr;
#endif
didLayoutFlush = true;
mFrameConstructor->RecalcQuotesAndCounters();
viewManager->FlushDelayedResize(true);
@ -8938,6 +8933,12 @@ PresShell::DoReflow(nsIFrame* target, bool aInterruptible)
timelines->AddMarkerForDocShell(docShell, "Reflow", MarkerTracingType::START);
}
#ifdef MOZ_GECKO_PROFILER
AutoProfilerTracing tracingLayoutFlush("Paint", "Reflow",
std::move(mReflowCause));
mReflowCause = nullptr;
#endif
if (mReflowContinueTimer) {
mReflowContinueTimer->Cancel();
mReflowContinueTimer = nullptr;