| 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 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 #define OwnPtrWillBeRawPtr WTF::RawPtr | 553 #define OwnPtrWillBeRawPtr WTF::RawPtr |
| 554 #define PassOwnPtrWillBeRawPtr WTF::RawPtr | 554 #define PassOwnPtrWillBeRawPtr WTF::RawPtr |
| 555 #define NoBaseWillBeGarbageCollected WebCore::GarbageCollected | 555 #define NoBaseWillBeGarbageCollected WebCore::GarbageCollected |
| 556 #define NoBaseWillBeGarbageCollectedFinalized WebCore::GarbageCollectedFinalized | 556 #define NoBaseWillBeGarbageCollectedFinalized WebCore::GarbageCollectedFinalized |
| 557 #define WillBeHeapHashMap WebCore::HeapHashMap | 557 #define WillBeHeapHashMap WebCore::HeapHashMap |
| 558 #define WillBePersistentHeapHashMap WebCore::PersistentHeapHashMap | 558 #define WillBePersistentHeapHashMap WebCore::PersistentHeapHashMap |
| 559 #define WillBeHeapHashSet WebCore::HeapHashSet | 559 #define WillBeHeapHashSet WebCore::HeapHashSet |
| 560 #define WillBePersistentHeapHashSet WebCore::PersistentHeapHashSet | 560 #define WillBePersistentHeapHashSet WebCore::PersistentHeapHashSet |
| 561 #define WillBeHeapVector WebCore::HeapVector | 561 #define WillBeHeapVector WebCore::HeapVector |
| 562 #define WillBePersistentHeapVector WebCore::PersistentHeapVector | 562 #define WillBePersistentHeapVector WebCore::PersistentHeapVector |
| 563 #define WillBeHeapSupplement WebCore::HeapSupplement |
| 564 #define WillBeHeapSupplementable WebCore::HeapSupplementable |
| 563 | 565 |
| 564 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) | 566 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) |
| 565 { | 567 { |
| 566 static const bool notRefCountedGarbageCollected = !WTF::IsSubclassOfTemplate
<T, RefCountedGarbageCollected>::value; | 568 static const bool notRefCountedGarbageCollected = !WTF::IsSubclassOfTemplate
<T, RefCountedGarbageCollected>::value; |
| 567 static const bool notRefCounted = !WTF::IsSubclassOfTemplate<T, RefCounted>:
:value; | 569 static const bool notRefCounted = !WTF::IsSubclassOfTemplate<T, RefCounted>:
:value; |
| 568 COMPILE_ASSERT(notRefCountedGarbageCollected, useAdoptRefCountedWillBeRefCou
ntedGarbageCollected); | 570 COMPILE_ASSERT(notRefCountedGarbageCollected, useAdoptRefCountedWillBeRefCou
ntedGarbageCollected); |
| 569 COMPILE_ASSERT(notRefCounted, youMustAdopt); | 571 COMPILE_ASSERT(notRefCounted, youMustAdopt); |
| 570 return PassRefPtrWillBeRawPtr<T>(ptr); | 572 return PassRefPtrWillBeRawPtr<T>(ptr); |
| 571 } | 573 } |
| 572 | 574 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 611 #define OwnPtrWillBeRawPtr WTF::OwnPtr | 613 #define OwnPtrWillBeRawPtr WTF::OwnPtr |
| 612 #define PassOwnPtrWillBeRawPtr WTF::PassOwnPtr | 614 #define PassOwnPtrWillBeRawPtr WTF::PassOwnPtr |
| 613 #define NoBaseWillBeGarbageCollected WebCore::DummyBase | 615 #define NoBaseWillBeGarbageCollected WebCore::DummyBase |
| 614 #define NoBaseWillBeGarbageCollectedFinalized WebCore::DummyBase | 616 #define NoBaseWillBeGarbageCollectedFinalized WebCore::DummyBase |
| 615 #define WillBeHeapHashMap WTF::HashMap | 617 #define WillBeHeapHashMap WTF::HashMap |
| 616 #define WillBePersistentHeapHashMap WTF::HashMap | 618 #define WillBePersistentHeapHashMap WTF::HashMap |
| 617 #define WillBeHeapHashSet WTF::HashSet | 619 #define WillBeHeapHashSet WTF::HashSet |
| 618 #define WillBePersistentHeapHashSet WTF::HashSet | 620 #define WillBePersistentHeapHashSet WTF::HashSet |
| 619 #define WillBeHeapVector WTF::Vector | 621 #define WillBeHeapVector WTF::Vector |
| 620 #define WillBePersistentHeapVector WTF::Vector | 622 #define WillBePersistentHeapVector WTF::Vector |
| 623 #define WillBeHeapSupplement WebCore::Supplement |
| 624 #define WillBeHeapSupplementable WebCore::Supplementable |
| 621 | 625 |
| 622 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) { retu
rn adoptRef(ptr); } | 626 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) { retu
rn adoptRef(ptr); } |
| 623 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefCountedWillBeRefCountedGa
rbageCollected(T* ptr) { return adoptRef(ptr); } | 627 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefCountedWillBeRefCountedGa
rbageCollected(T* ptr) { return adoptRef(ptr); } |
| 624 template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeNoop(T* ptr) { retu
rn adoptPtr(ptr); } | 628 template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeNoop(T* ptr) { retu
rn adoptPtr(ptr); } |
| 625 | 629 |
| 626 #define WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED WTF_MAKE_FAST_ALLOCATED | 630 #define WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED WTF_MAKE_FAST_ALLOCATED |
| 627 | 631 |
| 628 #endif // ENABLE(OILPAN) | 632 #endif // ENABLE(OILPAN) |
| 629 | 633 |
| 630 } // namespace WebCore | 634 } // namespace WebCore |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 751 }; | 755 }; |
| 752 | 756 |
| 753 template<typename T> inline T* getPtr(const WebCore::Member<T>& p) | 757 template<typename T> inline T* getPtr(const WebCore::Member<T>& p) |
| 754 { | 758 { |
| 755 return p.get(); | 759 return p.get(); |
| 756 } | 760 } |
| 757 | 761 |
| 758 } // namespace WTF | 762 } // namespace WTF |
| 759 | 763 |
| 760 #endif | 764 #endif |
| OLD | NEW |