| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2012 Google, Inc. All Rights Reserved. | 2  * Copyright (C) 2012 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 | 5  * modification, are permitted provided that the following conditions | 
| 6  * are met: | 6  * are met: | 
| 7  * 1. Redistributions of source code must retain the above copyright | 7  * 1. Redistributions of source code must retain the above copyright | 
| 8  *    notice, this list of conditions and the following disclaimer. | 8  *    notice, this list of conditions and the following disclaimer. | 
| 9  * 2. Redistributions in binary form must reproduce the above copyright | 9  * 2. Redistributions in binary form must reproduce the above copyright | 
| 10  *    notice, this list of conditions and the following disclaimer in the | 10  *    notice, this list of conditions and the following disclaimer in the | 
| 11  *    documentation and/or other materials provided with the distribution. | 11  *    documentation and/or other materials provided with the distribution. | 
| 12  * | 12  * | 
| 13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 
| 14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 
| 15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 
| 16  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR | 16  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR | 
| 17  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 
| 18  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 
| 19  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 
| 20  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 
| 21  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 24  */ | 24  */ | 
| 25 | 25 | 
| 26 #ifndef Supplementable_h | 26 #ifndef Supplementable_h | 
| 27 #define Supplementable_h | 27 #define Supplementable_h | 
| 28 | 28 | 
|  | 29 #include "platform/PlatformExport.h" | 
| 29 #include "platform/heap/Handle.h" | 30 #include "platform/heap/Handle.h" | 
| 30 #include "wtf/Assertions.h" | 31 #include "wtf/Assertions.h" | 
| 31 #include "wtf/HashMap.h" | 32 #include "wtf/HashMap.h" | 
| 32 #include "wtf/Noncopyable.h" | 33 #include "wtf/Noncopyable.h" | 
| 33 #include "wtf/OwnPtr.h" | 34 #include "wtf/OwnPtr.h" | 
| 34 #include "wtf/PassOwnPtr.h" | 35 #include "wtf/PassOwnPtr.h" | 
| 35 | 36 | 
| 36 #if ENABLE(ASSERT) | 37 #if ENABLE(ASSERT) | 
| 37 #include "wtf/Threading.h" | 38 #include "wtf/Threading.h" | 
| 38 #endif | 39 #endif | 
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 108     typedef PassOwnPtr<SupplementBase<T, false>> SupplementArgumentType; | 109     typedef PassOwnPtr<SupplementBase<T, false>> SupplementArgumentType; | 
| 109 }; | 110 }; | 
| 110 | 111 | 
| 111 template<bool> | 112 template<bool> | 
| 112 class SupplementTracing; | 113 class SupplementTracing; | 
| 113 | 114 | 
| 114 template<> | 115 template<> | 
| 115 class SupplementTracing<true> : public GarbageCollectedMixin { }; | 116 class SupplementTracing<true> : public GarbageCollectedMixin { }; | 
| 116 | 117 | 
| 117 template<> | 118 template<> | 
| 118 class GC_PLUGIN_IGNORE("crbug.com/476419") SupplementTracing<false> { | 119 class GC_PLUGIN_IGNORE("crbug.com/476419") PLATFORM_EXPORT SupplementTracing<fal
     se> { | 
| 119 public: | 120 public: | 
| 120     virtual ~SupplementTracing() { } | 121     virtual ~SupplementTracing() { } | 
| 121     // FIXME: Oilpan: this trace() method is only provided to minimize | 122     // FIXME: Oilpan: this trace() method is only provided to minimize | 
| 122     // the use of ENABLE(OILPAN) for Supplements deriving from the | 123     // the use of ENABLE(OILPAN) for Supplements deriving from the | 
| 123     // transition type WillBeHeapSupplement<>. | 124     // transition type WillBeHeapSupplement<>. | 
| 124     // | 125     // | 
| 125     // When that transition type is removed (or its use is substantially | 126     // When that transition type is removed (or its use is substantially | 
| 126     // reduced), remove this dummy trace method also. | 127     // reduced), remove this dummy trace method also. | 
| 127     DEFINE_INLINE_VIRTUAL_TRACE() { } | 128     DEFINE_INLINE_VIRTUAL_TRACE() { } | 
| 128 }; | 129 }; | 
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 232 }; | 233 }; | 
| 233 | 234 | 
| 234 template<typename T> | 235 template<typename T> | 
| 235 struct ThreadingTrait<SupplementableBase<T, true>> { | 236 struct ThreadingTrait<SupplementableBase<T, true>> { | 
| 236     static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity; | 237     static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity; | 
| 237 }; | 238 }; | 
| 238 | 239 | 
| 239 } // namespace blink | 240 } // namespace blink | 
| 240 | 241 | 
| 241 #endif // Supplementable_h | 242 #endif // Supplementable_h | 
| OLD | NEW | 
|---|