Revert of Rename Heap to ThreadHeap

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 88 matching lines @@
 //     {
 //         m_bar->...; // It is safe to touch other on-heap objects.
 //     }
 //     Member<Bar> m_bar;
 // };
 #define USING_PRE_FINALIZER(Class, preFinalizer)    \
 public:                                             \
 static bool invokePreFinalizer(void* object)        \
 {                                                   \
     Class* self = reinterpret_cast<Class*>(object); \
-    if (ThreadHeap::isHeapObjectAlive(self))              \
+    if (Heap::isHeapObjectAlive(self))              \
         return false;                               \
     self->Class::preFinalizer();                    \
     return true;                                    \
 }                                                   \
 using UsingPreFinalizerMacroNeedsTrailingSemiColon = char
 
 class PLATFORM_EXPORT ThreadState {
     USING_FAST_MALLOC(ThreadState);
     WTF_MAKE_NONCOPYABLE(ThreadState);
 public:
@@ skipping 128 matching lines @@
     bool isInGC() const { return gcState() == GCRunning; }
     bool isSweepingInProgress() const
     {
         return gcState() == Sweeping || gcState() == SweepingAndPreciseGCScheduled || gcState() == SweepingAndIdleGCScheduled;
     }
 
     // A GC runs in the following sequence.
     //
     // 1) All threads park at safe points.
     // 2) The GCing thread calls preGC() for all ThreadStates.
-    // 3) The GCing thread calls ThreadHeap::collectGarbage().
+    // 3) The GCing thread calls Heap::collectGarbage().
     //    This does marking but doesn't do sweeping.
     // 4) The GCing thread calls postGC() for all ThreadStates.
     // 5) The GCing thread resume all threads.
     // 6) Each thread calls preSweep().
     // 7) Each thread runs lazy sweeping (concurrently with sweepings
     //    in other threads) and eventually calls completeSweep().
     // 8) Each thread calls postSweep().
     //
     // Notes:
     // - We stop the world between 1) and 5).
@@ skipping 431 matching lines @@
 
 template<> class ThreadStateFor<AnyThread> {
     STATIC_ONLY(ThreadStateFor);
 public:
     static ThreadState* state() { return ThreadState::current(); }
 };
 
 } // namespace blink
 
 #endif // ThreadState_h