Chromium Code Reviews| Index: Source/heap/Handle.h |
| diff --git a/Source/heap/Handle.h b/Source/heap/Handle.h |
| index 20c629c0c16beea7e2a0ed4c51547584b94d5615..ce1c832fd79b3cc0df9ea6cbf8222cd7fdc4d231 100644 |
| --- a/Source/heap/Handle.h |
| +++ b/Source/heap/Handle.h |
| @@ -676,6 +676,8 @@ template<typename T, typename U> inline bool operator!=(const Persistent<T>& a, |
| #define RefCountedWillBeRefCountedGarbageCollected WebCore::RefCountedGarbageCollected |
| #define ThreadSafeRefCountedWillBeGarbageCollected WebCore::GarbageCollected |
| #define ThreadSafeRefCountedWillBeGarbageCollectedFinalized WebCore::GarbageCollectedFinalized |
| +#define ThreadSafeRefCountedWillBeRefCountedGarbageCollected WebCore::RefCountedGarbageCollected |
|
Mads Ager (chromium)
2014/03/27 11:06:49
Let's remove these macros. It seems dangerous to u
keishi
2014/04/03 06:53:19
Done.
|
| +#define ThreadSafeRefCountedWillBeThreadSafeRefCountedGarbageCollected WebCore::ThreadSafeRefCountedGarbageCollected |
| #define RefPtrWillBePersistent WebCore::Persistent |
| #define RefPtrWillBeRawPtr WTF::RawPtr |
| #define RefPtrWillBeMember WebCore::Member |
| @@ -717,6 +719,13 @@ template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeRefCountedGarbageCo |
| return PassRefPtrWillBeRawPtr<T>(adoptRefCountedGarbageCollected(ptr)); |
| } |
| +template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeThreadSafeRefCountedGarbageCollected(T* ptr) |
| +{ |
| + static const bool isThreadSafeRefCountedGarbageCollected = WTF::IsSubclassOfTemplate<T, ThreadSafeRefCountedGarbageCollected>::value; |
| + COMPILE_ASSERT(isThreadSafeRefCountedGarbageCollected, useAdoptRefWillBeNoop); |
| + return PassRefPtrWillBeRawPtr<T>(adoptRefCountedGarbageCollected(ptr)); |
| +} |
| + |
| template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeNoop(T* ptr) |
| { |
| static const bool notRefCountedGarbageCollected = !WTF::IsSubclassOfTemplate<T, RefCountedGarbageCollected>::value; |
| @@ -746,6 +755,8 @@ public: |
| #define RefCountedWillBeRefCountedGarbageCollected WTF::RefCounted |
| #define ThreadSafeRefCountedWillBeGarbageCollected WTF::ThreadSafeRefCounted |
| #define ThreadSafeRefCountedWillBeGarbageCollectedFinalized WTF::ThreadSafeRefCounted |
| +#define ThreadSafeRefCountedWillBeRefCountedGarbageCollected WTF::ThreadSafeRefCounted |
|
Mads Ager (chromium)
2014/03/27 11:06:49
And remove this one too.
keishi
2014/04/03 06:53:19
Done.
|
| +#define ThreadSafeRefCountedWillBeThreadSafeRefCountedGarbageCollected WTF::ThreadSafeRefCounted |
| #define RefPtrWillBePersistent WTF::RefPtr |
| #define RefPtrWillBeRawPtr WTF::RefPtr |
| #define RefPtrWillBeMember WTF::RefPtr |
| @@ -773,6 +784,7 @@ public: |
| template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) { return adoptRef(ptr); } |
| template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeRefCountedGarbageCollected(T* ptr) { return adoptRef(ptr); } |
| +template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeThreadSafeRefCountedGarbageCollected(T* ptr) { return adoptRef(ptr); } |
| template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeNoop(T* ptr) { return adoptPtr(ptr); } |
| #define WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED WTF_MAKE_FAST_ALLOCATED |