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 |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
209 private: | 209 private: |
210 ThreadIdentifier m_threadId; | 210 ThreadIdentifier m_threadId; |
211 #endif | 211 #endif |
212 }; | 212 }; |
213 | 213 |
214 template<typename T> | 214 template<typename T> |
215 class HeapSupplement : public SupplementBase<T, true> { }; | 215 class HeapSupplement : public SupplementBase<T, true> { }; |
216 | 216 |
217 // FIXME: Oilpan: Move GarbageCollectedMixin to SupplementableBase<T, true> once PersistentHeapSupplementable is removed again. | 217 // FIXME: Oilpan: Move GarbageCollectedMixin to SupplementableBase<T, true> once PersistentHeapSupplementable is removed again. |
218 template<typename T> | 218 template<typename T> |
219 class HeapSupplementable : public SupplementableBase<T, true>, public GarbageCol lectedMixin { }; | 219 class GC_PLUGIN_IGNORE("http://crbug.com/395036") HeapSupplementable : public Su pplementableBase<T, true>, public GarbageCollectedMixin { |
zerny-chromium
2014/07/19 07:21:58
DBC this ignore is really bad since it will execut
wibling-chromium
2014/07/21 08:38:49
FYI I am removing this ignore as part of removing
| |
220 public: | |
221 virtual void trace(Visitor* visitor) { SupplementableBase<T, true>::trace(vi sitor); } | |
222 }; | |
220 | 223 |
221 template<typename T> | 224 template<typename T> |
222 class PersistentHeapSupplementable : public SupplementableBase<T, true> { | 225 class PersistentHeapSupplementable : public SupplementableBase<T, true> { |
223 public: | 226 public: |
224 PersistentHeapSupplementable() : m_root(this) { } | 227 PersistentHeapSupplementable() : m_root(this) { } |
225 virtual ~PersistentHeapSupplementable() | 228 virtual ~PersistentHeapSupplementable() |
226 { | 229 { |
227 typedef typename SupplementableTraits<T, true>::SupplementMap::iterator SupplementIterator; | 230 typedef typename SupplementableTraits<T, true>::SupplementMap::iterator SupplementIterator; |
228 for (SupplementIterator it = this->m_supplements.begin(); it != this->m_ supplements.end(); ++it) | 231 for (SupplementIterator it = this->m_supplements.begin(); it != this->m_ supplements.end(); ++it) |
229 it->value->persistentHostHasBeenDestroyed(); | 232 it->value->persistentHostHasBeenDestroyed(); |
(...skipping 22 matching lines...) Expand all Loading... | |
252 }; | 255 }; |
253 | 256 |
254 template<typename T> | 257 template<typename T> |
255 struct ThreadingTrait<WebCore::SupplementableBase<T, true> > { | 258 struct ThreadingTrait<WebCore::SupplementableBase<T, true> > { |
256 static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity; | 259 static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity; |
257 }; | 260 }; |
258 | 261 |
259 } // namespace WebCore | 262 } // namespace WebCore |
260 | 263 |
261 #endif // Supplementable_h | 264 #endif // Supplementable_h |
OLD | NEW |