Refactor the Heap into ThreadHeap to prepare for per thread heaps

third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h

Index: third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h
diff --git a/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h b/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h
index 490eeac0b0b8c2150beadedeb6d9af5981162f64..893875d8fbb2885125202b531cd2055bb99d2d2a 100644
--- a/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h
+++ b/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h
@@ -138,7 +138,7 @@ struct WrapperTypeInfo {
     void refObject(ScriptWrappable* scriptWrappable) const
     {
         if (isGarbageCollected()) {
-            Heap::increaseWrapperCount(1);
+            ThreadState::current()->heap().heapStats().increaseWrapperCount(1);
         } else {
             ASSERT(refObjectFunction);
             refObjectFunction(scriptWrappable);
@@ -148,8 +148,9 @@ struct WrapperTypeInfo {
     void derefObject(ScriptWrappable* scriptWrappable) const
     {
         if (isGarbageCollected()) {
-            Heap::decreaseWrapperCount(1);
-            Heap::increaseCollectedWrapperCount(1);
+            GCHeapStats& heapStats = ThreadState::current()->heap().heapStats();
+            heapStats.decreaseWrapperCount(1);
+            heapStats.increaseCollectedWrapperCount(1);
         } else {
             ASSERT(derefObjectFunction);
             derefObjectFunction(scriptWrappable);
@@ -159,8 +160,9 @@ struct WrapperTypeInfo {
     void derefObject() const
     {
         ASSERT(isGarbageCollected());
-        Heap::decreaseWrapperCount(1);
-        Heap::increaseCollectedWrapperCount(1);
+        GCHeapStats& heapStats = ThreadState::current()->heap().heapStats();
+        heapStats.decreaseWrapperCount(1);
+        heapStats.increaseCollectedWrapperCount(1);
     }
 
     void trace(Visitor* visitor, ScriptWrappable* scriptWrappable) const