| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 820 #define WillBeHeapHashCountedSet WebCore::HeapHashCountedSet | 820 #define WillBeHeapHashCountedSet WebCore::HeapHashCountedSet |
| 821 #define WillBePersistentHeapHashCountedSet WebCore::PersistentHeapHashCountedSet | 821 #define WillBePersistentHeapHashCountedSet WebCore::PersistentHeapHashCountedSet |
| 822 #define WillBeGarbageCollectedMixin WebCore::GarbageCollectedMixin | 822 #define WillBeGarbageCollectedMixin WebCore::GarbageCollectedMixin |
| 823 #define WillBeHeapSupplement WebCore::HeapSupplement | 823 #define WillBeHeapSupplement WebCore::HeapSupplement |
| 824 #define WillBeHeapSupplementable WebCore::HeapSupplementable | 824 #define WillBeHeapSupplementable WebCore::HeapSupplementable |
| 825 #define WillBePersistentHeapSupplementable WebCore::PersistentHeapSupplementable | 825 #define WillBePersistentHeapSupplementable WebCore::PersistentHeapSupplementable |
| 826 #define WillBeHeapTerminatedArray WebCore::HeapTerminatedArray | 826 #define WillBeHeapTerminatedArray WebCore::HeapTerminatedArray |
| 827 #define WillBeHeapTerminatedArrayBuilder WebCore::HeapTerminatedArrayBuilder | 827 #define WillBeHeapTerminatedArrayBuilder WebCore::HeapTerminatedArrayBuilder |
| 828 #define WillBeHeapLinkedStack WebCore::HeapLinkedStack | 828 #define WillBeHeapLinkedStack WebCore::HeapLinkedStack |
| 829 #define PersistentHeapHashSetWillBeHeapHashSet WebCore::HeapHashSet | 829 #define PersistentHeapHashSetWillBeHeapHashSet WebCore::HeapHashSet |
| 830 #define GarbageCollectedFinalizedWillBeGarbageCollected WebCore::GarbageCollecte
d |
| 830 | 831 |
| 831 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) | 832 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) |
| 832 { | 833 { |
| 833 static const bool notRefCountedGarbageCollected = !WTF::IsSubclassOfTemplate
<typename WTF::RemoveConst<T>::Type, RefCountedGarbageCollected>::value; | 834 static const bool notRefCountedGarbageCollected = !WTF::IsSubclassOfTemplate
<typename WTF::RemoveConst<T>::Type, RefCountedGarbageCollected>::value; |
| 834 static const bool notRefCounted = !WTF::IsSubclassOfTemplate<typename WTF::R
emoveConst<T>::Type, RefCounted>::value; | 835 static const bool notRefCounted = !WTF::IsSubclassOfTemplate<typename WTF::R
emoveConst<T>::Type, RefCounted>::value; |
| 835 COMPILE_ASSERT(notRefCountedGarbageCollected, useAdoptRefCountedWillBeRefCou
ntedGarbageCollected); | 836 COMPILE_ASSERT(notRefCountedGarbageCollected, useAdoptRefCountedWillBeRefCou
ntedGarbageCollected); |
| 836 COMPILE_ASSERT(notRefCounted, youMustAdopt); | 837 COMPILE_ASSERT(notRefCounted, youMustAdopt); |
| 837 return PassRefPtrWillBeRawPtr<T>(ptr); | 838 return PassRefPtrWillBeRawPtr<T>(ptr); |
| 838 } | 839 } |
| 839 | 840 |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 939 #define WillBeHeapHeapCountedSet WTF::HeapCountedSet | 940 #define WillBeHeapHeapCountedSet WTF::HeapCountedSet |
| 940 #define WillBePersistentHeapHeapCountedSet WTF::HeapCountedSet | 941 #define WillBePersistentHeapHeapCountedSet WTF::HeapCountedSet |
| 941 #define WillBeGarbageCollectedMixin WebCore::DummyBase<void> | 942 #define WillBeGarbageCollectedMixin WebCore::DummyBase<void> |
| 942 #define WillBeHeapSupplement WebCore::Supplement | 943 #define WillBeHeapSupplement WebCore::Supplement |
| 943 #define WillBeHeapSupplementable WebCore::Supplementable | 944 #define WillBeHeapSupplementable WebCore::Supplementable |
| 944 #define WillBePersistentHeapSupplementable WebCore::Supplementable | 945 #define WillBePersistentHeapSupplementable WebCore::Supplementable |
| 945 #define WillBeHeapTerminatedArray WTF::TerminatedArray | 946 #define WillBeHeapTerminatedArray WTF::TerminatedArray |
| 946 #define WillBeHeapTerminatedArrayBuilder WTF::TerminatedArrayBuilder | 947 #define WillBeHeapTerminatedArrayBuilder WTF::TerminatedArrayBuilder |
| 947 #define WillBeHeapLinkedStack WTF::LinkedStack | 948 #define WillBeHeapLinkedStack WTF::LinkedStack |
| 948 #define PersistentHeapHashSetWillBeHeapHashSet WebCore::PersistentHeapHashSet | 949 #define PersistentHeapHashSetWillBeHeapHashSet WebCore::PersistentHeapHashSet |
| 950 #define GarbageCollectedFinalizedWillBeGarbageCollected WebCore::GarbageCollecte
dFinalized |
| 949 | 951 |
| 950 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) { retu
rn adoptRef(ptr); } | 952 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) { retu
rn adoptRef(ptr); } |
| 951 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeRefCountedGarbageCo
llected(T* ptr) { return adoptRef(ptr); } | 953 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeRefCountedGarbageCo
llected(T* ptr) { return adoptRef(ptr); } |
| 952 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeThreadSafeRefCounte
dGarbageCollected(T* ptr) { return adoptRef(ptr); } | 954 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeThreadSafeRefCounte
dGarbageCollected(T* ptr) { return adoptRef(ptr); } |
| 953 template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeNoop(T* ptr) { retu
rn adoptPtr(ptr); } | 955 template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeNoop(T* ptr) { retu
rn adoptPtr(ptr); } |
| 954 template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeRefCountedGarbageCo
llected(T* ptr) { return adoptPtr(ptr); } | 956 template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeRefCountedGarbageCo
llected(T* ptr) { return adoptPtr(ptr); } |
| 955 | 957 |
| 956 template<typename T> T* adoptRefCountedGarbageCollectedWillBeNoop(T* ptr) | 958 template<typename T> T* adoptRefCountedGarbageCollectedWillBeNoop(T* ptr) |
| 957 { | 959 { |
| 958 static const bool isRefCountedGarbageCollected = WTF::IsSubclassOfTemplate<t
ypename WTF::RemoveConst<T>::Type, RefCountedGarbageCollected>::value; | 960 static const bool isRefCountedGarbageCollected = WTF::IsSubclassOfTemplate<t
ypename WTF::RemoveConst<T>::Type, RefCountedGarbageCollected>::value; |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1161 struct ParamStorageTraits<T*> : public PointerParamStorageTraits<T*, WebCore::Is
GarbageCollectedType<T>::value> { | 1163 struct ParamStorageTraits<T*> : public PointerParamStorageTraits<T*, WebCore::Is
GarbageCollectedType<T>::value> { |
| 1162 }; | 1164 }; |
| 1163 | 1165 |
| 1164 template<typename T> | 1166 template<typename T> |
| 1165 struct ParamStorageTraits<RawPtr<T> > : public PointerParamStorageTraits<T*, Web
Core::IsGarbageCollectedType<T>::value> { | 1167 struct ParamStorageTraits<RawPtr<T> > : public PointerParamStorageTraits<T*, Web
Core::IsGarbageCollectedType<T>::value> { |
| 1166 }; | 1168 }; |
| 1167 | 1169 |
| 1168 } // namespace WTF | 1170 } // namespace WTF |
| 1169 | 1171 |
| 1170 #endif | 1172 #endif |
| OLD | NEW |