heap: Re-use flag to switch to V8 Oilpan from WTF

Reuse the WTF macro in platform/heap/ to avoid maintaining two macros.

Bug: chromium:1056170
Change-Id: I3c3867c798ff76eeed72050674c6709a39d5f018
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533776
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827195}

third_party/blink/renderer/platform/heap/BUILD.gn

@@ -16,7 +16,6 @@ buildflag_header("blink_heap_buildflags") {
   flags = [
     "BLINK_HEAP_VERIFICATION=$enable_blink_heap_verification",
     "BLINK_HEAP_YOUNG_GENERATION=$enable_blink_heap_young_generation",
-    "BLINK_HEAP_USE_V8_OILPAN=$enable_blink_heap_use_v8_oilpan",
   ]
 }
 
@@ -83,6 +82,7 @@ blink_platform_sources("heap") {
     "//third_party/blink/renderer/platform:make_platform_generated",
     "//third_party/blink/renderer/platform/heap:heap_unsanitized",
     "//third_party/blink/renderer/platform/heap/asm",
+    "//third_party/blink/renderer/platform/wtf:buildflags",
     "//third_party/icu",
     "//v8",
   ]
@@ -196,6 +196,7 @@ source_set("test_support") {
     "//third_party/blink/public/mojom:mojom_platform_blink_headers",
     "//third_party/blink/renderer/platform:bindings_buildflags",
     "//third_party/blink/renderer/platform:platform",
+    "//third_party/blink/renderer/platform/wtf:buildflags",
   ]
   public_deps = [ "//base/test:test_support" ]
 }

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_BLINK_GC_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_BLINK_GC_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/blink_gc.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/blink_gc.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_BLINK_GC_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_BLINK_GC_MEMORY_DUMP_PROVIDER_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_BLINK_GC_MEMORY_DUMP_PROVIDER_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/blink_gc_memory_dump_provider.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/blink_gc_memory_dump_provider.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_BLINK_GC_MEMORY_DUMP_PROVIDER_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_DISALLOW_NEW_WRAPPER_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_DISALLOW_NEW_WRAPPER_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/disallow_new_wrapper.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/disallow_new_wrapper.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_DISALLOW_NEW_WRAPPER_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_GARBAGE_COLLECTED_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_GARBAGE_COLLECTED_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/garbage_collected.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/garbage_collected.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_GARBAGE_COLLECTED_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_GC_TASK_RUNNER_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_GC_TASK_RUNNER_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/gc_task_runner.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/gc_task_runner.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_GC_TASK_RUNNER_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/heap.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/heap.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_ALLOCATOR_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_ALLOCATOR_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/heap_allocator.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/heap_allocator.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_ALLOCATOR_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_STATS_COLLECTOR_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_STATS_COLLECTOR_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/heap_stats_collector.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/heap_stats_collector.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_STATS_COLLECTOR_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_TRAITS_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_TRAITS_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/heap_traits.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/heap_traits.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_HEAP_TRAITS_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_MEMBER_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_MEMBER_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/member.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/member.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_MEMBER_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_PERSISTENT_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_PERSISTENT_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/persistent.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/persistent.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_PERSISTENT_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_PROCESS_HEAP_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_PROCESS_HEAP_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/process_heap.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/process_heap.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_PROCESS_HEAP_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_THREAD_STATE_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_THREAD_STATE_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/thread_state.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/thread_state.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_THREAD_STATE_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_THREAD_STATE_SCOPES_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_THREAD_STATE_SCOPES_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/thread_state_scopes.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/thread_state_scopes.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_THREAD_STATE_SCOPES_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_UNIFIED_HEAP_CONTROLLER_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_UNIFIED_HEAP_CONTROLLER_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/unified_heap_controller.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/unified_heap_controller.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_UNIFIED_HEAP_CONTROLLER_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_UNIFIED_HEAP_MARKING_VISITOR_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_UNIFIED_HEAP_MARKING_VISITOR_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/unified_heap_marking_visitor.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/unified_heap_marking_visitor.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_UNIFIED_HEAP_MARKING_VISITOR_H_

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

@@ -5,12 +5,12 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_VISITOR_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_VISITOR_H_
 
-#include "third_party/blink/renderer/platform/heap/heap_buildflags.h"
+#include "third_party/blink/renderer/platform/wtf/buildflags.h"
 
-#if BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#if BUILDFLAG(USE_V8_OILPAN)
 #include "third_party/blink/renderer/platform/heap/v8_wrapper/visitor.h"
-#else  // !BLINK_HEAP_USE_V8_OILPAN
+#else  // !USE_V8_OILPAN
 #include "third_party/blink/renderer/platform/heap/impl/visitor.h"
-#endif  // !BLINK_HEAP_USE_V8_OILPAN
+#endif  // !USE_V8_OILPAN
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_VISITOR_H_

third_party/blink/renderer/platform/wtf/type_traits.h

@@ -32,7 +32,7 @@
 
 #if BUILDFLAG(USE_V8_OILPAN)
 #include "v8/include/cppgc/type-traits.h"  // nogncheck
-#else
+#else                                      // !BUILDFLAG(USE_V8_OILPAN)
 namespace blink {
 template <typename T>
 class Member;
@@ -40,7 +40,7 @@ class Visitor;
 template <typename T>
 class WeakMember;
 }  // namespace blink
-#endif  // BUILDFLAG(BLINK_HEAP_USE_V8_OILPAN)
+#endif                                     // !BUILDFLAG(USE_V8_OILPAN)
 
 namespace WTF {