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