1111#include " bindings/v8/platform/heap/persistent.h"
1212#include " bindings/v8/platform/wtf/hash_traits.h"
1313#include " bindings/v8/platform/heap/write_barrier.h"
14+ #include " foundation/macros.h"
1415
1516namespace webf {
1617
@@ -37,19 +38,19 @@ constexpr auto kMemberDeletedValue = cppgc::kSentinelPointer;
3738
3839template <typename T>
3940struct ThreadingTrait <Member<T>> {
40- STATIC_ONLY (ThreadingTrait);
41+ WEBF_STATIC_ONLY (ThreadingTrait);
4142 static constexpr ThreadAffinity kAffinity = ThreadingTrait<T>::kAffinity ;
4243};
4344
4445template <typename T>
4546struct ThreadingTrait <WeakMember<T>> {
46- STATIC_ONLY (ThreadingTrait);
47+ WEBF_STATIC_ONLY (ThreadingTrait);
4748 static constexpr ThreadAffinity kAffinity = ThreadingTrait<T>::kAffinity ;
4849};
4950
5051template <typename T>
5152struct ThreadingTrait <UntracedMember<T>> {
52- STATIC_ONLY (ThreadingTrait);
53+ WEBF_STATIC_ONLY (ThreadingTrait);
5354 static constexpr ThreadAffinity kAffinity = ThreadingTrait<T>::kAffinity ;
5455};
5556
@@ -74,7 +75,7 @@ static_assert(kBlinkMemberGCHasDebugChecks ||
7475
7576template <typename T>
7677struct IsTraceable <Member<T>> {
77- STATIC_ONLY (IsTraceable);
78+ WEBF_STATIC_ONLY (IsTraceable);
7879 static const bool value = true ;
7980};
8081
@@ -83,7 +84,7 @@ struct IsWeak<WeakMember<T>> : std::true_type {};
8384
8485template <typename T>
8586struct IsTraceable <WeakMember<T>> {
86- STATIC_ONLY (IsTraceable);
87+ WEBF_STATIC_ONLY (IsTraceable);
8788 static const bool value = true ;
8889};
8990
@@ -92,7 +93,7 @@ struct IsTraceable<WeakMember<T>> {
9293// directly with any of those types.
9394template <typename T>
9495class ValuePeeker final {
95- DISALLOW_NEW ();
96+ WEBF_DISALLOW_NEW ();
9697
9798 public:
9899 // NOLINTNEXTLINE
@@ -131,7 +132,7 @@ class ValuePeeker final {
131132// Default hash for hash tables with Member<>-derived elements.
132133template <typename T, typename MemberType>
133134struct BaseMemberHashTraits : SimpleClassHashTraits<MemberType> {
134- STATIC_ONLY (BaseMemberHashTraits);
135+ WEBF_STATIC_ONLY (BaseMemberHashTraits);
135136
136137 // Heap hash containers allow to operate with raw pointers, e.g.
137138 // HeapHashSet<Member<GCed>> set;
@@ -198,22 +199,22 @@ struct HashTraits<webf::UntracedMember<T>> : UntracedMemberHashTraits<T> {};
198199
199200template <typename T>
200201class MemberConstructTraits {
201- STATIC_ONLY (MemberConstructTraits);
202+ WEBF_STATIC_ONLY (MemberConstructTraits);
202203
203204 public:
204205 template <typename ... Args>
205206 static T* Construct (void * location, Args&&... args) {
206207 // `Construct()` creates a new Member which must not be visible to the
207208 // concurrent marker yet, similar to regular ctors in Member.
208- return new (NotNullTag::kNotNull , location) T (std::forward<Args>(args)...);
209+ return new (base:: NotNullTag::kNotNull , location) T (std::forward<Args>(args)...);
209210 }
210211
211212 template <typename ... Args>
212213 static T* ConstructAndNotifyElement (void * location, Args&&... args) {
213214 // `ConstructAndNotifyElement()` updates an existing Member which might
214215 // also be concurrently traced while we update it. The regular ctors
215216 // for Member don't use an atomic write which can lead to data races.
216- T* object = new (NotNullTag::kNotNull , location)
217+ T* object = new (base:: NotNullTag::kNotNull , location)
217218 T (std::forward<Args>(args)..., typename T::AtomicInitializerTag ());
218219 NotifyNewElement (object);
219220 return object;
0 commit comments