| Index: third_party/WebKit/Source/platform/heap/ThreadState.cpp
|
| diff --git a/third_party/WebKit/Source/platform/heap/ThreadState.cpp b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
|
| index 85d1bf511358dbc944ba83bdeb67999eda042f6e..6de74ee303239de4501e362af93cb96b62edb787 100644
|
| --- a/third_party/WebKit/Source/platform/heap/ThreadState.cpp
|
| +++ b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
|
| @@ -153,7 +153,6 @@ ThreadState::ThreadState()
|
| m_accumulatedSweepingTime(0),
|
| m_vectorBackingArenaIndex(BlinkGC::Vector1ArenaIndex),
|
| m_currentArenaAges(0),
|
| - m_isTerminating(false),
|
| m_gcMixinMarker(nullptr),
|
| m_shouldFlushHeapDoesNotContainCache(false),
|
| m_gcState(NoGCScheduled),
|
| @@ -224,17 +223,6 @@ void ThreadState::runTerminationGC() {
|
|
|
| releaseStaticPersistentNodes();
|
|
|
| - // From here on ignore all conservatively discovered
|
| - // pointers into the heap owned by this thread.
|
| - m_isTerminating = true;
|
| -
|
| - // Set the terminate flag on all heap pages of this thread. This is used to
|
| - // ensure we don't trace pages on other threads that are not part of the
|
| - // thread local GC.
|
| - // TODO(haraken): Remove this. This is not needed once we remove a thread-
|
| - // local termination GC.
|
| - prepareForThreadStateTermination();
|
| -
|
| ProcessHeap::crossThreadPersistentRegion().prepareForThreadStateTermination(
|
| this);
|
|
|
| @@ -1200,12 +1188,6 @@ void ThreadState::postSweep() {
|
| }
|
| }
|
|
|
| -void ThreadState::prepareForThreadStateTermination() {
|
| - ASSERT(checkThread());
|
| - for (int i = 0; i < BlinkGC::NumberOfArenas; ++i)
|
| - m_arenas[i]->prepareHeapForTermination();
|
| -}
|
| -
|
| #if DCHECK_IS_ON()
|
| BasePage* ThreadState::findPageFromAddress(Address address) {
|
| for (int i = 0; i < BlinkGC::NumberOfArenas; ++i) {
|
|
|