Chromium Code Reviews| Index: Source/platform/heap/Handle.h |
| diff --git a/Source/platform/heap/Handle.h b/Source/platform/heap/Handle.h |
| index 6a46cef73a1b9bbf1ee303b986977ceb9d7d81f2..80a81da3e6f4c3e354acf667c389c192f7f0fbfc 100644 |
| --- a/Source/platform/heap/Handle.h |
| +++ b/Source/platform/heap/Handle.h |
| @@ -40,6 +40,15 @@ |
| #include "wtf/RefCounted.h" |
| #include "wtf/TypeTraits.h" |
| +namespace WTF { |
| +template<typename T> |
| +class DummyBase { |
|
zerny-chromium
2014/06/02 12:59:07
I think this needs a PLATFORM_EXPORT to satisfy th
sof
2014/06/02 14:25:03
That might work, but this is a template, so unclea
sof
2014/06/02 22:00:46
I've addressed the smaller problem of supporting D
|
| +public: |
| + DummyBase() { } |
| + ~DummyBase() { } |
| +}; |
| +} |
| + |
| namespace WebCore { |
| template<typename T> class HeapTerminatedArray; |
| @@ -870,13 +879,6 @@ template<typename T> T* adoptPtrWillBeRefCountedGarbageCollected(T* ptr) |
| #else // !ENABLE(OILPAN) |
| -template<typename T> |
| -class DummyBase { |
| -public: |
| - DummyBase() { } |
| - ~DummyBase() { } |
| -}; |
| - |
| #define PassRefPtrWillBeRawPtr WTF::PassRefPtr |
| #define RefCountedWillBeGarbageCollected WTF::RefCounted |
| #define RefCountedWillBeGarbageCollectedFinalized WTF::RefCounted |
| @@ -900,9 +902,9 @@ public: |
| #define WeakPtrWillBeMember WTF::WeakPtr |
| #define WeakPtrWillBeRawPtr WTF::WeakPtr |
| #define WeakPtrWillBeWeakMember WTF::WeakPtr |
| -#define NoBaseWillBeGarbageCollected WebCore::DummyBase |
| -#define NoBaseWillBeGarbageCollectedFinalized WebCore::DummyBase |
| -#define NoBaseWillBeRefCountedGarbageCollected WebCore::DummyBase |
| +#define NoBaseWillBeGarbageCollected WTF::DummyBase |
| +#define NoBaseWillBeGarbageCollectedFinalized WTF::DummyBase |
| +#define NoBaseWillBeRefCountedGarbageCollected WTF::DummyBase |
| #define WillBeHeapHashMap WTF::HashMap |
| #define WillBePersistentHeapHashMap WTF::HashMap |
| #define WillBeHeapHashSet WTF::HashSet |
| @@ -917,7 +919,7 @@ public: |
| #define WillBePersistentHeapDeque WTF::Deque |
| #define WillBeHeapHeapCountedSet WTF::HeapCountedSet |
| #define WillBePersistentHeapHeapCountedSet WTF::HeapCountedSet |
| -#define WillBeGarbageCollectedMixin WebCore::DummyBase<void> |
| +#define WillBeGarbageCollectedMixin WTF::DummyBase<void> |
| #define WillBeHeapSupplement WebCore::Supplement |
| #define WillBeHeapSupplementable WebCore::Supplementable |
| #define WillBeHeapTerminatedArray WTF::TerminatedArray |