Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1838)

Unified Diff: Source/platform/heap/ThreadState.cpp

Issue 1097443004: Oilpan: rename GCState and GCReason values to reflect function only. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/heap/ThreadState.h ('k') | Source/web/WebHeap.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/heap/ThreadState.cpp
diff --git a/Source/platform/heap/ThreadState.cpp b/Source/platform/heap/ThreadState.cpp
index 4d92a400e2c5e07420ea59ec7d423228b3472836..3e4f0052a2f3b4a7364cbe69ccc4b56ad88f433b 100644
--- a/Source/platform/heap/ThreadState.cpp
+++ b/Source/platform/heap/ThreadState.cpp
@@ -700,7 +700,7 @@ void unexpectedGCState(ThreadState::GCState gcState)
UNEXPECTED_GCSTATE(NoGCScheduled);
UNEXPECTED_GCSTATE(IdleGCScheduled);
UNEXPECTED_GCSTATE(PreciseGCScheduled);
- UNEXPECTED_GCSTATE(GCScheduledForTesting);
+ UNEXPECTED_GCSTATE(FullGCScheduled);
UNEXPECTED_GCSTATE(StoppingOtherThreads);
UNEXPECTED_GCSTATE(GCRunning);
UNEXPECTED_GCSTATE(EagerSweepScheduled);
@@ -729,14 +729,14 @@ void ThreadState::setGCState(GCState gcState)
break;
case IdleGCScheduled:
case PreciseGCScheduled:
- case GCScheduledForTesting:
+ case FullGCScheduled:
checkThread();
- VERIFY_STATE_TRANSITION(m_gcState == NoGCScheduled || m_gcState == IdleGCScheduled || m_gcState == PreciseGCScheduled || m_gcState == GCScheduledForTesting || m_gcState == StoppingOtherThreads || m_gcState == SweepingAndIdleGCScheduled || m_gcState == SweepingAndPreciseGCScheduled);
+ VERIFY_STATE_TRANSITION(m_gcState == NoGCScheduled || m_gcState == IdleGCScheduled || m_gcState == PreciseGCScheduled || m_gcState == FullGCScheduled || m_gcState == StoppingOtherThreads || m_gcState == SweepingAndIdleGCScheduled || m_gcState == SweepingAndPreciseGCScheduled);
completeSweep();
break;
case StoppingOtherThreads:
checkThread();
- VERIFY_STATE_TRANSITION(m_gcState == NoGCScheduled || m_gcState == IdleGCScheduled || m_gcState == PreciseGCScheduled || m_gcState == GCScheduledForTesting || m_gcState == Sweeping || m_gcState == SweepingAndIdleGCScheduled || m_gcState == SweepingAndPreciseGCScheduled);
+ VERIFY_STATE_TRANSITION(m_gcState == NoGCScheduled || m_gcState == IdleGCScheduled || m_gcState == PreciseGCScheduled || m_gcState == FullGCScheduled || m_gcState == Sweeping || m_gcState == SweepingAndIdleGCScheduled || m_gcState == SweepingAndPreciseGCScheduled);
completeSweep();
break;
case GCRunning:
@@ -788,7 +788,7 @@ void ThreadState::runScheduledGC(StackState stackState)
return;
switch (gcState()) {
- case GCScheduledForTesting:
+ case FullGCScheduled:
Heap::collectAllGarbage();
break;
case PreciseGCScheduled:
« no previous file with comments | « Source/platform/heap/ThreadState.h ('k') | Source/web/WebHeap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698