Chromium Code Reviews| 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 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 554 #define OwnPtrWillBeRawPtr WTF::RawPtr | 554 #define OwnPtrWillBeRawPtr WTF::RawPtr |
| 555 #define PassOwnPtrWillBeRawPtr WTF::RawPtr | 555 #define PassOwnPtrWillBeRawPtr WTF::RawPtr |
| 556 #define NoBaseWillBeGarbageCollected WebCore::GarbageCollected | 556 #define NoBaseWillBeGarbageCollected WebCore::GarbageCollected |
| 557 #define NoBaseWillBeGarbageCollectedFinalized WebCore::GarbageCollectedFinalized | 557 #define NoBaseWillBeGarbageCollectedFinalized WebCore::GarbageCollectedFinalized |
| 558 #define WillBeHeapHashMap WebCore::HeapHashMap | 558 #define WillBeHeapHashMap WebCore::HeapHashMap |
| 559 #define WillBePersistentHeapHashMap WebCore::PersistentHeapHashMap | 559 #define WillBePersistentHeapHashMap WebCore::PersistentHeapHashMap |
| 560 #define WillBeHeapHashSet WebCore::HeapHashSet | 560 #define WillBeHeapHashSet WebCore::HeapHashSet |
| 561 #define WillBePersistentHeapHashSet WebCore::PersistentHeapHashSet | 561 #define WillBePersistentHeapHashSet WebCore::PersistentHeapHashSet |
| 562 #define WillBeHeapVector WebCore::HeapVector | 562 #define WillBeHeapVector WebCore::HeapVector |
| 563 #define WillBePersistentHeapVector WebCore::PersistentHeapVector | 563 #define WillBePersistentHeapVector WebCore::PersistentHeapVector |
| 564 #define WillBeHeapSupplement WebCore::HeapSupplement | |
| 565 #define WillBeHeapSupplementable WebCore::HeapSupplementable | |
|
haraken
2014/02/27 02:46:01
Nit: I'd prefer "GarbageCollectedSupplementable" a
haraken
2014/02/27 08:39:50
Nit: Now I agree with "HeapSupplement" since it do
sof
2014/02/27 08:50:37
Nooo... I've just gone through the pains of renami
haraken
2014/02/27 09:07:20
I AM Sorry!
| |
| 564 | 566 |
| 565 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) | 567 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) |
| 566 { | 568 { |
| 567 static const bool notRefCountedGarbageCollected = !WTF::IsSubclassOfTemplate <T, RefCountedGarbageCollected>::value; | 569 static const bool notRefCountedGarbageCollected = !WTF::IsSubclassOfTemplate <T, RefCountedGarbageCollected>::value; |
| 568 static const bool notRefCounted = !WTF::IsSubclassOfTemplate<T, RefCounted>: :value; | 570 static const bool notRefCounted = !WTF::IsSubclassOfTemplate<T, RefCounted>: :value; |
| 569 COMPILE_ASSERT(notRefCountedGarbageCollected, useAdoptRefCountedWillBeRefCou ntedGarbageCollected); | 571 COMPILE_ASSERT(notRefCountedGarbageCollected, useAdoptRefCountedWillBeRefCou ntedGarbageCollected); |
| 570 COMPILE_ASSERT(notRefCounted, youMustAdopt); | 572 COMPILE_ASSERT(notRefCounted, youMustAdopt); |
| 571 return PassRefPtrWillBeRawPtr<T>(ptr); | 573 return PassRefPtrWillBeRawPtr<T>(ptr); |
| 572 } | 574 } |
| 573 | 575 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 612 #define OwnPtrWillBeRawPtr WTF::OwnPtr | 614 #define OwnPtrWillBeRawPtr WTF::OwnPtr |
| 613 #define PassOwnPtrWillBeRawPtr WTF::PassOwnPtr | 615 #define PassOwnPtrWillBeRawPtr WTF::PassOwnPtr |
| 614 #define NoBaseWillBeGarbageCollected WebCore::DummyBase | 616 #define NoBaseWillBeGarbageCollected WebCore::DummyBase |
| 615 #define NoBaseWillBeGarbageCollectedFinalized WebCore::DummyBase | 617 #define NoBaseWillBeGarbageCollectedFinalized WebCore::DummyBase |
| 616 #define WillBeHeapHashMap WTF::HashMap | 618 #define WillBeHeapHashMap WTF::HashMap |
| 617 #define WillBePersistentHeapHashMap WTF::HashMap | 619 #define WillBePersistentHeapHashMap WTF::HashMap |
| 618 #define WillBeHeapHashSet WTF::HashSet | 620 #define WillBeHeapHashSet WTF::HashSet |
| 619 #define WillBePersistentHeapHashSet WTF::HashSet | 621 #define WillBePersistentHeapHashSet WTF::HashSet |
| 620 #define WillBeHeapVector WTF::Vector | 622 #define WillBeHeapVector WTF::Vector |
| 621 #define WillBePersistentHeapVector WTF::Vector | 623 #define WillBePersistentHeapVector WTF::Vector |
| 624 #define WillBeHeapSupplement WebCore::Supplement | |
| 625 #define WillBeHeapSupplementable WebCore::Supplementable | |
| 622 | 626 |
| 623 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) { retu rn adoptRef(ptr); } | 627 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefWillBeNoop(T* ptr) { retu rn adoptRef(ptr); } |
| 624 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefCountedWillBeRefCountedGa rbageCollected(T* ptr) { return adoptRef(ptr); } | 628 template<typename T> PassRefPtrWillBeRawPtr<T> adoptRefCountedWillBeRefCountedGa rbageCollected(T* ptr) { return adoptRef(ptr); } |
| 625 template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeNoop(T* ptr) { retu rn adoptPtr(ptr); } | 629 template<typename T> PassOwnPtrWillBeRawPtr<T> adoptPtrWillBeNoop(T* ptr) { retu rn adoptPtr(ptr); } |
| 626 | 630 |
| 627 #define WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED WTF_MAKE_FAST_ALLOCATED | 631 #define WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED WTF_MAKE_FAST_ALLOCATED |
| 628 | 632 |
| 629 #endif // ENABLE(OILPAN) | 633 #endif // ENABLE(OILPAN) |
| 630 | 634 |
| 631 } // namespace WebCore | 635 } // namespace WebCore |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 752 }; | 756 }; |
| 753 | 757 |
| 754 template<typename T> inline T* getPtr(const WebCore::Member<T>& p) | 758 template<typename T> inline T* getPtr(const WebCore::Member<T>& p) |
| 755 { | 759 { |
| 756 return p.get(); | 760 return p.get(); |
| 757 } | 761 } |
| 758 | 762 |
| 759 } // namespace WTF | 763 } // namespace WTF |
| 760 | 764 |
| 761 #endif | 765 #endif |
| OLD | NEW |