Prepare for multiple ThreadHeaps

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

Index: third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
diff --git a/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h b/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
index 76c5519813545e37d9563a6086d7a62a0582ce2c..938091041e7d3a1b3aa88a801178c2387d5a5dd0 100644
--- a/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
+++ b/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
@@ -44,7 +44,7 @@ protected:
         header->mark();
 
         if (callback)
-            ThreadHeap::pushTraceCallback(const_cast<void*>(objectPointer), callback);
+            ThreadHeap::main()->pushTraceCallback(const_cast<void*>(objectPointer), callback);

[haraken, 2016/04/21 11:48:25]

This code is performance-sensitive, but ThreadHeap::main() is just looking up a
static variable, so it would be ok.

[keishi, 2016/04/22 06:09:59]

Done.

     }
 
     inline void mark(const void* objectPointer, TraceCallback callback)
@@ -58,7 +58,7 @@ protected:
     inline void registerDelayedMarkNoTracing(const void* objectPointer)
     {
         ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
-        ThreadHeap::pushPostMarkingCallback(const_cast<void*>(objectPointer), &markNoTracingCallback);
+        ThreadHeap::main()->pushPostMarkingCallback(const_cast<void*>(objectPointer), &markNoTracingCallback);
     }
 
     inline void registerWeakMembers(const void* closure, const void* objectPointer, WeakCallback callback)
@@ -67,19 +67,19 @@ protected:
         // We don't want to run weak processings when taking a snapshot.
         if (toDerived()->getMarkingMode() == Visitor::SnapshotMarking)
             return;
-        ThreadHeap::pushThreadLocalWeakCallback(const_cast<void*>(closure), const_cast<void*>(objectPointer), callback);
+        ThreadHeap::main()->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::registerWeakTable(const_cast<void*>(closure), iterationCallback, iterationDoneCallback);
+        ThreadHeap::main()->registerWeakTable(const_cast<void*>(closure), iterationCallback, iterationDoneCallback);
     }
 
 #if ENABLE(ASSERT)
     inline bool weakTableRegistered(const void* closure)
     {
-        return ThreadHeap::weakTableRegistered(closure);
+        return ThreadHeap::main()->weakTableRegistered(closure);
     }
 #endif
 
@@ -117,7 +117,7 @@ protected:
         // We don't want to run weak processings when taking a snapshot.
         if (toDerived()->getMarkingMode() == Visitor::SnapshotMarking)
             return;
-        ThreadHeap::pushGlobalWeakCallback(cell, callback);
+        ThreadHeap::main()->pushGlobalWeakCallback(cell, callback);
     }
 
 private: