Oilpan: Make the GC heuristics saner

Source/platform/heap/Heap.h

Index: Source/platform/heap/Heap.h
diff --git a/Source/platform/heap/Heap.h b/Source/platform/heap/Heap.h
index fd8da32387b87e85ca04f5ca93267a7104388095..d7ea9fb18eb022ff45837de918691b7c3527d594 100644
--- a/Source/platform/heap/Heap.h
+++ b/Source/platform/heap/Heap.h
@@ -1024,19 +1024,19 @@ public:
     static size_t allocatedObjectSize() { return acquireLoad(&s_allocatedObjectSize); }
     static void increaseMarkedObjectSize(size_t delta) { atomicAdd(&s_markedObjectSize, static_cast<long>(delta)); }
     static size_t markedObjectSize() { return acquireLoad(&s_markedObjectSize); }
+    static void setMarkedObjectSizeAtLastCompleteSweep(size_t size) { releaseStore(&s_markedObjectSizeAtLastCompleteSweep, size); }
+    static size_t markedObjectSizeAtLastCompleteSweep() { return acquireLoad(&s_markedObjectSizeAtLastCompleteSweep); }
     static void increaseAllocatedSpace(size_t delta) { atomicAdd(&s_allocatedSpace, static_cast<long>(delta)); }
     static void decreaseAllocatedSpace(size_t delta) { atomicSubtract(&s_allocatedSpace, static_cast<long>(delta)); }
     static size_t allocatedSpace() { return acquireLoad(&s_allocatedSpace); }
     static size_t objectSizeAtLastGC() { return acquireLoad(&s_objectSizeAtLastGC); }
-    static void increasePersistentCount(size_t delta) { atomicAdd(&s_persistentCount, static_cast<long>(delta)); }
-    static void decreasePersistentCount(size_t delta) { atomicSubtract(&s_persistentCount, static_cast<long>(delta)); }
-    static size_t persistentCount() { return acquireLoad(&s_persistentCount); }
-    static size_t persistentCountAtLastGC() { return acquireLoad(&s_persistentCountAtLastGC); }
-    static void increaseCollectedPersistentCount(size_t delta) { atomicAdd(&s_collectedPersistentCount, static_cast<long>(delta)); }
-    static size_t collectedPersistentCount() { return acquireLoad(&s_collectedPersistentCount); }
+    static void increaseWrapperCount(size_t delta) { atomicAdd(&s_wrapperCount, static_cast<long>(delta)); }
+    static void decreaseWrapperCount(size_t delta) { atomicSubtract(&s_wrapperCount, static_cast<long>(delta)); }
+    static size_t wrapperCount() { return acquireLoad(&s_wrapperCount); }
+    static size_t wrapperCountAtLastGC() { return acquireLoad(&s_wrapperCountAtLastGC); }
+    static void increaseCollectedWrapperCount(size_t delta) { atomicAdd(&s_collectedWrapperCount, static_cast<long>(delta)); }
+    static size_t collectedWrapperCount() { return acquireLoad(&s_collectedWrapperCount); }
     static size_t partitionAllocSizeAtLastGC() { return acquireLoad(&s_partitionAllocSizeAtLastGC); }
-    static size_t heapSizePerPersistent() { return acquireLoad(&s_heapSizePerPersistent); }
-    static void setHeapSizePerPersistent(size_t size) { releaseStore(&s_heapSizePerPersistent, size); }
 
     static double estimatedMarkingTime();
     static void reportMemoryUsageHistogram();
@@ -1081,11 +1081,11 @@ private:
     static size_t s_allocatedObjectSize;
     static size_t s_objectSizeAtLastGC;
     static size_t s_markedObjectSize;
-    static size_t s_persistentCount;
-    static size_t s_persistentCountAtLastGC;
-    static size_t s_collectedPersistentCount;
+    static size_t s_markedObjectSizeAtLastCompleteSweep;
+    static size_t s_wrapperCount;
+    static size_t s_wrapperCountAtLastGC;
+    static size_t s_collectedWrapperCount;
     static size_t s_partitionAllocSizeAtLastGC;
-    static size_t s_heapSizePerPersistent;
     static double s_estimatedMarkingTimePerByte;
 
     friend class ThreadState;