corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1897657 - Remove PresShell::mReflowContinueTimer. r=dholbert

Browse Source 
In bug 1895870 I (somewhat unintentionally) made this code not called at
all.

Instead of scheduling a 30ms timer if reflow was interrupted, we just
schedule a reflow for the next refresh driver tick via
EnsureLayoutFlush(). Which is what would happen anyways before my change
in presence of other changes (like page loading appending content or
what not).

I think thus that the new behavior is more predictable (the 30ms timer
was never quite measured, it was introduced in bug 499447).

So, just simplify the code.

Differential Revision: https://phabricator.services.mozilla.com/D210890
This commit is contained in:
Emilio Cobos Álvarez
2024-05-20 06:41:27 +00:00
parent 1f299be050
commit ba1fb75fa2
2 changed files with 8 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
layout/base/PresShell.cpp
View File

@@ -1255,12 +1255,6 @@ void PresShell::Destroy() {
// If our paint suppression timer is still active, kill it.
CancelPaintSuppressionTimer();
// Same for our reflow continuation timer
if (mReflowContinueTimer) {
mReflowContinueTimer->Cancel();
mReflowContinueTimer = nullptr;
}
mSynthMouseMoveEvent.Revoke();
mUpdateApproximateFrameVisibilityEvent.Revoke();
@@ -9714,11 +9708,13 @@ void PresShell::DidDoReflow(bool aInterruptible) {
UnsuppressAndInvalidate();
}
} else {
// If any new reflow commands were enqueued during the reflow, schedule
// another reflow event to process them. Note that we want to do this
// after DidDoReflow(), since that method can change whether there are
// dirty roots around by flushing, and there's no point in posting a
// reflow event just to have the flush revoke it.
// If any new reflow commands were enqueued during the reflow (or we didn't
// reflow everything because we were interrupted), schedule another reflow
// event to process them.
//
// Note that we want to do this after DidDoReflow(), since that method can
// change whether there are dirty roots around by flushing, and there's no
// point in posting a reflow event just to have the flush revoke it.
EnsureLayoutFlush();
}
}
@@ -9737,25 +9733,6 @@ DOMHighResTimeStamp PresShell::GetPerformanceNowUnclamped() {
return now;
}
bool PresShell::ScheduleReflowOffTimer() {
MOZ_ASSERT(!mObservingStyleFlushes, "Shouldn't get here");
ASSERT_REFLOW_SCHEDULED_STATE();
if (mReflowContinueTimer) {
return true;
}
nsresult rv = NS_NewTimerWithFuncCallback(
getter_AddRefs(mReflowContinueTimer),
[](nsITimer* aTimer, void* aPresShell) {
RefPtr<PresShell> self = static_cast<PresShell*>(aPresShell);
MOZ_ASSERT(aTimer == self->mReflowContinueTimer, "Unexpected timer");
self->mReflowContinueTimer = nullptr;
self->EnsureLayoutFlush();
},
this, 30, nsITimer::TYPE_ONE_SHOT, "ReflowContinueCallback",
GetMainThreadSerialEventTarget());
return NS_SUCCEEDED(rv);
}
bool PresShell::DoReflow(nsIFrame* target, bool aInterruptible,
OverflowChangedTracker* aOverflowTracker) {
[[maybe_unused]] nsIURI* uri = mDocument->GetDocumentURI();
@@ -9791,11 +9768,6 @@ bool PresShell::DoReflow(nsIFrame* target, bool aInterruptible,
FlushPendingScrollAnchorSelections();
if (mReflowContinueTimer) {
mReflowContinueTimer->Cancel();
mReflowContinueTimer = nullptr;
}
const bool isRoot = target == mFrameConstructor->GetRootFrame();
MOZ_ASSERT(isRoot || aOverflowTracker,