| 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 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 #define PassOwnPtrWillBeRawPtr WTF::RawPtr | 625 #define PassOwnPtrWillBeRawPtr WTF::RawPtr |
| 626 #define NoBaseWillBeGarbageCollected WebCore::GarbageCollected | 626 #define NoBaseWillBeGarbageCollected WebCore::GarbageCollected |
| 627 #define NoBaseWillBeGarbageCollectedFinalized WebCore::GarbageCollectedFinalized | 627 #define NoBaseWillBeGarbageCollectedFinalized WebCore::GarbageCollectedFinalized |
| 628 #define WillBeHeapHashMap WebCore::HeapHashMap | 628 #define WillBeHeapHashMap WebCore::HeapHashMap |
| 629 #define WillBePersistentHeapHashMap WebCore::PersistentHeapHashMap | 629 #define WillBePersistentHeapHashMap WebCore::PersistentHeapHashMap |
| 630 #define WillBeHeapHashSet WebCore::HeapHashSet | 630 #define WillBeHeapHashSet WebCore::HeapHashSet |
| 631 #define WillBePersistentHeapHashSet WebCore::PersistentHeapHashSet | 631 #define WillBePersistentHeapHashSet WebCore::PersistentHeapHashSet |
| 632 #define WillBeHeapVector WebCore::HeapVector | 632 #define WillBeHeapVector WebCore::HeapVector |
| 633 #define WillBePersistentHeapVector WebCore::PersistentHeapVector | 633 #define WillBePersistentHeapVector WebCore::PersistentHeapVector |
| 634 #define WillBeGarbageCollectedMixin WebCore::GarbageCollectedMixin | 634 #define WillBeGarbageCollectedMixin WebCore::GarbageCollectedMixin |
| 635 #define WillBeHeapSupplement WebCore::HeapSupplement |
| 636 #define WillBeHeapSupplementable WebCore::HeapSupplementable |
| 635 | 637 |
| 636 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) | 638 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) |
| 637 { | 639 { |
| 638 static const bool notRefCountedGarbageCollected = !WTF::IsSubclassOfTemplate
<T, RefCountedGarbageCollected>::value; | 640 static const bool notRefCountedGarbageCollected = !WTF::IsSubclassOfTemplate
<T, RefCountedGarbageCollected>::value; |
| 639 static const bool notRefCounted = !WTF::IsSubclassOfTemplate<T, RefCounted>:
:value; | 641 static const bool notRefCounted = !WTF::IsSubclassOfTemplate<T, RefCounted>:
:value; |
| 640 COMPILE_ASSERT(notRefCountedGarbageCollected, useAdoptRefCountedWillBeRefCou
ntedGarbageCollected); | 642 COMPILE_ASSERT(notRefCountedGarbageCollected, useAdoptRefCountedWillBeRefCou
ntedGarbageCollected); |
| 641 COMPILE_ASSERT(notRefCounted, youMustAdopt); | 643 COMPILE_ASSERT(notRefCounted, youMustAdopt); |
| 642 return PassRefPtrWillBeRawPtr<T>(ptr); | 644 return PassRefPtrWillBeRawPtr<T>(ptr); |
| 643 } | 645 } |
| 644 | 646 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 684 #define PassOwnPtrWillBeRawPtr WTF::PassOwnPtr | 686 #define PassOwnPtrWillBeRawPtr WTF::PassOwnPtr |
| 685 #define NoBaseWillBeGarbageCollected WebCore::DummyBase | 687 #define NoBaseWillBeGarbageCollected WebCore::DummyBase |
| 686 #define NoBaseWillBeGarbageCollectedFinalized WebCore::DummyBase | 688 #define NoBaseWillBeGarbageCollectedFinalized WebCore::DummyBase |
| 687 #define WillBeHeapHashMap WTF::HashMap | 689 #define WillBeHeapHashMap WTF::HashMap |
| 688 #define WillBePersistentHeapHashMap WTF::HashMap | 690 #define WillBePersistentHeapHashMap WTF::HashMap |
| 689 #define WillBeHeapHashSet WTF::HashSet | 691 #define WillBeHeapHashSet WTF::HashSet |
| 690 #define WillBePersistentHeapHashSet WTF::HashSet | 692 #define WillBePersistentHeapHashSet WTF::HashSet |
| 691 #define WillBeHeapVector WTF::Vector | 693 #define WillBeHeapVector WTF::Vector |
| 692 #define WillBePersistentHeapVector WTF::Vector | 694 #define WillBePersistentHeapVector WTF::Vector |
| 693 #define WillBeGarbageCollectedMixin WebCore::DummyBase<void> | 695 #define WillBeGarbageCollectedMixin WebCore::DummyBase<void> |
| 696 #define WillBeHeapSupplement WebCore::Supplement |
| 697 #define WillBeHeapSupplementable WebCore::Supplementable |
| 694 | 698 |
| 695 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) { retu
rn adoptRef(ptr); } | 699 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) { retu
rn adoptRef(ptr); } |
| 696 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeRefCountedGarbageCo
llected(T* ptr) { return adoptRef(ptr); } | 700 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeRefCountedGarbageCo
llected(T* ptr) { return adoptRef(ptr); } |
| 697 template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeNoop(T* ptr) { retu
rn adoptPtr(ptr); } | 701 template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeNoop(T* ptr) { retu
rn adoptPtr(ptr); } |
| 698 | 702 |
| 699 #define WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED WTF_MAKE_FAST_ALLOCATED | 703 #define WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED WTF_MAKE_FAST_ALLOCATED |
| 700 | 704 |
| 701 #endif // ENABLE(OILPAN) | 705 #endif // ENABLE(OILPAN) |
| 702 | 706 |
| 703 } // namespace WebCore | 707 } // namespace WebCore |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 841 }; | 845 }; |
| 842 | 846 |
| 843 template<typename T, typename U> | 847 template<typename T, typename U> |
| 844 struct NeedsTracing<HashMap<T, U> > { | 848 struct NeedsTracing<HashMap<T, U> > { |
| 845 static const bool value = false; | 849 static const bool value = false; |
| 846 }; | 850 }; |
| 847 | 851 |
| 848 } // namespace WTF | 852 } // namespace WTF |
| 849 | 853 |
| 850 #endif | 854 #endif |
| OLD | NEW |