Replace wtf/atomics.h with <atomic> in ProcessHeap.

Bug: 736037
Change-Id: I86fec7e292751bcd7dd4a0091704a8cc79dcacc8
Reviewed-on: https://chromium-review.googlesource.com/c/1348832Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610628}

third_party/blink/renderer/platform/heap/persistent_node.h

@@ -11,6 +11,7 @@
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/wtf/allocator.h"
 #include "third_party/blink/renderer/platform/wtf/assertions.h"
+#include "third_party/blink/renderer/platform/wtf/atomics.h"
 #include "third_party/blink/renderer/platform/wtf/threading_primitives.h"
 
 namespace blink {

third_party/blink/renderer/platform/heap/process_heap.cc

@@ -61,8 +61,8 @@ Mutex& ProcessHeap::CrossThreadPersistentMutex() {
   return mutex;
 }
 
-size_t ProcessHeap::total_allocated_space_ = 0;
-size_t ProcessHeap::total_allocated_object_size_ = 0;
-size_t ProcessHeap::total_marked_object_size_ = 0;
+std::atomic_size_t ProcessHeap::total_allocated_space_{0};
+std::atomic_size_t ProcessHeap::total_allocated_object_size_{0};
+std::atomic_size_t ProcessHeap::total_marked_object_size_{0};
 
 }  // namespace blink

third_party/blink/renderer/platform/heap/process_heap.h

@@ -5,9 +5,9 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_PROCESS_HEAP_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_PROCESS_HEAP_H_
 
+#include <atomic>
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/wtf/allocator.h"
-#include "third_party/blink/renderer/platform/wtf/atomics.h"
 #include "third_party/blink/renderer/platform/wtf/threading_primitives.h"
 
 namespace blink {
@@ -35,38 +35,38 @@ class PLATFORM_EXPORT ProcessHeap {
   static Mutex& CrossThreadPersistentMutex();
 
   static void IncreaseTotalAllocatedObjectSize(size_t delta) {
-    AtomicAdd(&total_allocated_object_size_, static_cast<long>(delta));
+    total_allocated_object_size_.fetch_add(delta, std::memory_order_relaxed);
   }
   static void DecreaseTotalAllocatedObjectSize(size_t delta) {
-    AtomicSubtract(&total_allocated_object_size_, static_cast<long>(delta));
+    total_allocated_object_size_.fetch_sub(delta, std::memory_order_relaxed);
   }
   static size_t TotalAllocatedObjectSize() {
-    return AcquireLoad(&total_allocated_object_size_);
+    return total_allocated_object_size_.load(std::memory_order_relaxed);
   }
   static void IncreaseTotalMarkedObjectSize(size_t delta) {
-    AtomicAdd(&total_marked_object_size_, static_cast<long>(delta));
+    total_marked_object_size_.fetch_add(delta, std::memory_order_relaxed);
   }
   static void DecreaseTotalMarkedObjectSize(size_t delta) {
-    AtomicSubtract(&total_marked_object_size_, static_cast<long>(delta));
+    total_marked_object_size_.fetch_sub(delta, std::memory_order_relaxed);
   }
   static size_t TotalMarkedObjectSize() {
-    return AcquireLoad(&total_marked_object_size_);
+    return total_marked_object_size_.load(std::memory_order_relaxed);
   }
   static void IncreaseTotalAllocatedSpace(size_t delta) {
-    AtomicAdd(&total_allocated_space_, static_cast<long>(delta));
+    total_allocated_space_.fetch_add(delta, std::memory_order_relaxed);
   }
   static void DecreaseTotalAllocatedSpace(size_t delta) {
-    AtomicSubtract(&total_allocated_space_, static_cast<long>(delta));
+    total_allocated_space_.fetch_sub(delta, std::memory_order_relaxed);
   }
   static size_t TotalAllocatedSpace() {
-    return AcquireLoad(&total_allocated_space_);
+    return total_allocated_space_.load(std::memory_order_relaxed);
   }
   static void ResetHeapCounters();
 
  private:
-  static size_t total_allocated_space_;
-  static size_t total_allocated_object_size_;
-  static size_t total_marked_object_size_;
+  static std::atomic_size_t total_allocated_space_;
+  static std::atomic_size_t total_allocated_object_size_;
+  static std::atomic_size_t total_marked_object_size_;
 
   friend class ThreadState;
 };