Oilpan: Split out ProcessHeap from Heap.h

Bug: None
Change-Id: I9fbb01166c6dbf6f5dc58de116c9de1a739b904e
Reviewed-on: https://chromium-review.googlesource.com/890143Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Keishi Hattori <keishi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532386}

third_party/WebKit/Source/platform/heap/BUILD.gn

@@ -54,6 +54,8 @@ blink_platform_sources("heap") {
     "Persistent.h",
     "PersistentNode.cpp",
     "PersistentNode.h",
+    "ProcessHeap.cpp",
+    "ProcessHeap.h",
     "SafePoint.h",
     "SelfKeepAlive.h",
     "SparseHeapBitmap.cpp",

third_party/WebKit/Source/platform/heap/Heap.cpp

@@ -61,30 +61,6 @@ void ThreadHeap::FlushHeapDoesNotContainCache() {
   heap_does_not_contain_cache_->Flush();
 }
 
-void ProcessHeap::Init() {
-  total_allocated_space_ = 0;
-  total_allocated_object_size_ = 0;
-  total_marked_object_size_ = 0;
-
-  GCInfoTable::Init();
-  CallbackStackMemoryPool::Instance().Initialize();
-}
-
-void ProcessHeap::ResetHeapCounters() {
-  total_allocated_object_size_ = 0;
-  total_marked_object_size_ = 0;
-}
-
-CrossThreadPersistentRegion& ProcessHeap::GetCrossThreadPersistentRegion() {
-  DEFINE_THREAD_SAFE_STATIC_LOCAL(CrossThreadPersistentRegion,
-                                  persistent_region, ());
-  return persistent_region;
-}
-
-size_t ProcessHeap::total_allocated_space_ = 0;
-size_t ProcessHeap::total_allocated_object_size_ = 0;
-size_t ProcessHeap::total_marked_object_size_ = 0;
-
 ThreadHeapStats::ThreadHeapStats()
     : allocated_space_(0),
       allocated_object_size_(0),

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

@@ -38,13 +38,13 @@
 #include "platform/PlatformExport.h"
 #include "platform/heap/GCInfo.h"
 #include "platform/heap/HeapPage.h"
+#include "platform/heap/ProcessHeap.h"
 #include "platform/heap/StackFrameDepth.h"
 #include "platform/heap/ThreadState.h"
 #include "platform/heap/Visitor.h"
 #include "platform/wtf/AddressSanitizer.h"
 #include "platform/wtf/Allocator.h"
 #include "platform/wtf/Assertions.h"
-#include "platform/wtf/Atomics.h"
 #include "platform/wtf/Forward.h"
 
 namespace blink {
@@ -83,7 +83,6 @@ class PLATFORM_EXPORT HeapAllocHooks {
   static FreeHook* free_hook_;
 };
 
-class CrossThreadPersistentRegion;
 class HeapCompact;
 template <typename T>
 class Member;
@@ -118,51 +117,6 @@ class ObjectAliveTrait<T, true> {
   }
 };
 
-class PLATFORM_EXPORT ProcessHeap {
-  STATIC_ONLY(ProcessHeap);
-
- public:
-  static void Init();
-
-  static CrossThreadPersistentRegion& GetCrossThreadPersistentRegion();
-
-  static void IncreaseTotalAllocatedObjectSize(size_t delta) {
-    AtomicAdd(&total_allocated_object_size_, static_cast<long>(delta));
-  }
-  static void DecreaseTotalAllocatedObjectSize(size_t delta) {
-    AtomicSubtract(&total_allocated_object_size_, static_cast<long>(delta));
-  }
-  static size_t TotalAllocatedObjectSize() {
-    return AcquireLoad(&total_allocated_object_size_);
-  }
-  static void IncreaseTotalMarkedObjectSize(size_t delta) {
-    AtomicAdd(&total_marked_object_size_, static_cast<long>(delta));
-  }
-  static void DecreaseTotalMarkedObjectSize(size_t delta) {
-    AtomicSubtract(&total_marked_object_size_, static_cast<long>(delta));
-  }
-  static size_t TotalMarkedObjectSize() {
-    return AcquireLoad(&total_marked_object_size_);
-  }
-  static void IncreaseTotalAllocatedSpace(size_t delta) {
-    AtomicAdd(&total_allocated_space_, static_cast<long>(delta));
-  }
-  static void DecreaseTotalAllocatedSpace(size_t delta) {
-    AtomicSubtract(&total_allocated_space_, static_cast<long>(delta));
-  }
-  static size_t TotalAllocatedSpace() {
-    return AcquireLoad(&total_allocated_space_);
-  }
-  static void ResetHeapCounters();
-
- private:
-  static size_t total_allocated_space_;
-  static size_t total_allocated_object_size_;
-  static size_t total_marked_object_size_;
-
-  friend class ThreadState;
-};
-
 // Stats for the heap.
 class ThreadHeapStats {
   USING_FAST_MALLOC(ThreadHeapStats);

third_party/WebKit/Source/platform/heap/ProcessHeap.cpp

+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "platform/heap/ProcessHeap.h"
+
+#include "platform/heap/CallbackStack.h"
+#include "platform/heap/GCInfo.h"
+#include "platform/heap/PersistentNode.h"
+#include "platform/heap/VisitorImpl.h"
+#include "platform/wtf/Assertions.h"
+
+namespace blink {
+
+void ProcessHeap::Init() {
+  total_allocated_space_ = 0;
+  total_allocated_object_size_ = 0;
+  total_marked_object_size_ = 0;
+
+  GCInfoTable::Init();
+  CallbackStackMemoryPool::Instance().Initialize();
+}
+
+void ProcessHeap::ResetHeapCounters() {
+  total_allocated_object_size_ = 0;
+  total_marked_object_size_ = 0;
+}
+
+CrossThreadPersistentRegion& ProcessHeap::GetCrossThreadPersistentRegion() {
+  DEFINE_THREAD_SAFE_STATIC_LOCAL(CrossThreadPersistentRegion,
+                                  persistent_region, ());
+  return persistent_region;
+}
+
+size_t ProcessHeap::total_allocated_space_ = 0;
+size_t ProcessHeap::total_allocated_object_size_ = 0;
+size_t ProcessHeap::total_marked_object_size_ = 0;
+
+}  // namespace blink

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

+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ProcessHeap_h
+#define ProcessHeap_h
+
+#include "platform/PlatformExport.h"
+#include "platform/wtf/Allocator.h"
+#include "platform/wtf/Atomics.h"
+
+namespace blink {
+
+class CrossThreadPersistentRegion;
+
+class PLATFORM_EXPORT ProcessHeap {
+  STATIC_ONLY(ProcessHeap);
+
+ public:
+  static void Init();
+
+  static CrossThreadPersistentRegion& GetCrossThreadPersistentRegion();
+
+  static void IncreaseTotalAllocatedObjectSize(size_t delta) {
+    AtomicAdd(&total_allocated_object_size_, static_cast<long>(delta));
+  }
+  static void DecreaseTotalAllocatedObjectSize(size_t delta) {
+    AtomicSubtract(&total_allocated_object_size_, static_cast<long>(delta));
+  }
+  static size_t TotalAllocatedObjectSize() {
+    return AcquireLoad(&total_allocated_object_size_);
+  }
+  static void IncreaseTotalMarkedObjectSize(size_t delta) {
+    AtomicAdd(&total_marked_object_size_, static_cast<long>(delta));
+  }
+  static void DecreaseTotalMarkedObjectSize(size_t delta) {
+    AtomicSubtract(&total_marked_object_size_, static_cast<long>(delta));
+  }
+  static size_t TotalMarkedObjectSize() {
+    return AcquireLoad(&total_marked_object_size_);
+  }
+  static void IncreaseTotalAllocatedSpace(size_t delta) {
+    AtomicAdd(&total_allocated_space_, static_cast<long>(delta));
+  }
+  static void DecreaseTotalAllocatedSpace(size_t delta) {
+    AtomicSubtract(&total_allocated_space_, static_cast<long>(delta));
+  }
+  static size_t TotalAllocatedSpace() {
+    return AcquireLoad(&total_allocated_space_);
+  }
+  static void ResetHeapCounters();
+
+ private:
+  static size_t total_allocated_space_;
+  static size_t total_allocated_object_size_;
+  static size_t total_marked_object_size_;
+
+  friend class ThreadState;
+};
+
+}  // namespace blink
+
+#endif