diff --git a/dom/base/CCGCScheduler.h b/dom/base/CCGCScheduler.h index ffc16d6feaa2..831759cd2477 100644 --- a/dom/base/CCGCScheduler.h +++ b/dom/base/CCGCScheduler.h @@ -63,9 +63,9 @@ static const int64_t kNumCCNodesBetweenTimeChecks = 1000; // Actions performed by the GCRunner state machine. enum class GCRunnerAction { - MajorGC, // We want to start a new major GC - MajorGCReady, // The parent says we may begin our major GC - GCSlice, // Run a single slice of a major GC + WaitToMajorGC, // We want to start a new major GC + StartMajorGC, // The parent says we may begin our major GC + GCSlice, // Run a single slice of a major GC None }; @@ -665,13 +665,13 @@ GCRunnerStep CCGCScheduler::GetNextGCRunnerAction(TimeStamp aDeadline) { } if (mReadyForMajorGC) { - GCRunnerStep step{GCRunnerAction::MajorGCReady, mMajorGCReason}; + GCRunnerStep step{GCRunnerAction::StartMajorGC, mMajorGCReason}; mMajorGCReason = JS::GCReason::NO_REASON; return step; } if (mMajorGCReason != JS::GCReason::NO_REASON) { - GCRunnerStep step{GCRunnerAction::MajorGC, mMajorGCReason}; + GCRunnerStep step{GCRunnerAction::WaitToMajorGC, mMajorGCReason}; mMajorGCReason = JS::GCReason::NO_REASON; return step; } diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 2cb9928565c7..2b1cf2ba2100 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -1608,7 +1608,7 @@ bool GCRunnerFired(TimeStamp aDeadline, void* /* aClosure */) { nsJSContext::KillGCRunner(); return false; - case GCRunnerAction::MajorGC: { + case GCRunnerAction::WaitToMajorGC: { RefPtr mbPromise = MayGCNow(step.mReason); if (!mbPromise || mbPromise->IsResolved()) { // Only use the promise if it's not resolved yet, otherwise fall through @@ -1638,7 +1638,7 @@ bool GCRunnerFired(TimeStamp aDeadline, void* /* aClosure */) { return true; } - case GCRunnerAction::MajorGCReady: + case GCRunnerAction::StartMajorGC: case GCRunnerAction::GCSlice: break; }