Revert of Prepare for multiple ThreadHeaps

third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MarkingVisitorImpl_h
 #define MarkingVisitorImpl_h
 
 #include "platform/heap/Heap.h"
 #include "platform/heap/ThreadState.h"
 #include "platform/heap/Visitor.h"
@@ skipping 26 matching lines @@
 
         if (header->isMarked())
             return;
 
         ASSERT(ThreadState::current()->isInGC());
         ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
 
         header->mark();
 
         if (callback)
-            ThreadHeap::mainThreadHeap()->pushTraceCallback(const_cast<void*>(objectPointer), callback);
+            ThreadHeap::pushTraceCallback(const_cast<void*>(objectPointer), callback);
     }
 
     inline void mark(const void* objectPointer, TraceCallback callback)
     {
         if (!objectPointer)
             return;
         HeapObjectHeader* header = HeapObjectHeader::fromPayload(objectPointer);
         markHeader(header, header->payload(), callback);
     }
 
     inline void registerDelayedMarkNoTracing(const void* objectPointer)
     {
         ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
-        ThreadHeap::mainThreadHeap()->pushPostMarkingCallback(const_cast<void*>(objectPointer), &markNoTracingCallback);
+        ThreadHeap::pushPostMarkingCallback(const_cast<void*>(objectPointer), &markNoTracingCallback);
     }
 
     inline void registerWeakMembers(const void* closure, const void* objectPointer, WeakCallback callback)
     {
         ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
         // We don't want to run weak processings when taking a snapshot.
         if (toDerived()->getMarkingMode() == Visitor::SnapshotMarking)
             return;
-        ThreadHeap::mainThreadHeap()->pushThreadLocalWeakCallback(const_cast<void*>(closure), const_cast<void*>(objectPointer), callback);
+        ThreadHeap::pushThreadLocalWeakCallback(const_cast<void*>(closure), const_cast<void*>(objectPointer), callback);
     }
 
     inline void registerWeakTable(const void* closure, EphemeronCallback iterationCallback, EphemeronCallback iterationDoneCallback)
     {
         ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
-        ThreadHeap::mainThreadHeap()->registerWeakTable(const_cast<void*>(closure), iterationCallback, iterationDoneCallback);
+        ThreadHeap::registerWeakTable(const_cast<void*>(closure), iterationCallback, iterationDoneCallback);
     }
 
 #if ENABLE(ASSERT)
     inline bool weakTableRegistered(const void* closure)
     {
-        return ThreadHeap::mainThreadHeap()->weakTableRegistered(closure);
+        return ThreadHeap::weakTableRegistered(closure);
     }
 #endif
 
     inline bool ensureMarked(const void* objectPointer)
     {
         if (!objectPointer)
             return false;
         if (!toDerived()->shouldMarkObject(objectPointer))
             return false;
 #if ENABLE(ASSERT)
@@ skipping 17 matching lines @@
         return static_cast<Derived*>(this);
     }
 
 protected:
     inline void registerWeakCellWithCallback(void** cell, WeakCallback callback)
     {
         ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
         // We don't want to run weak processings when taking a snapshot.
         if (toDerived()->getMarkingMode() == Visitor::SnapshotMarking)
             return;
-        ThreadHeap::mainThreadHeap()->pushGlobalWeakCallback(cell, callback);
+        ThreadHeap::pushGlobalWeakCallback(cell, callback);
     }
 
 private:
     static void markNoTracingCallback(Visitor* visitor, void* object)
     {
         visitor->markNoTracing(object);
     }
 };
 
 } // namespace blink
 
 #endif