| Index: sky/engine/platform/Supplementable.h
|
| diff --git a/sky/engine/platform/Supplementable.h b/sky/engine/platform/Supplementable.h
|
| index a8c40869a2f8a8ccb5cc4ad401a9f732bf564d8d..dc48bf53db042d9659172df3ec23b803ef042975 100644
|
| --- a/sky/engine/platform/Supplementable.h
|
| +++ b/sky/engine/platform/Supplementable.h
|
| @@ -143,9 +143,6 @@ public:
|
| {
|
| return host ? host->requireSupplement(key) : 0;
|
| }
|
| -
|
| - // FIXME: Oilpan: Remove this callback once PersistentHeapSupplementable is removed again.
|
| - virtual void persistentHostHasBeenDestroyed() { }
|
| };
|
|
|
| // Helper class for implementing Supplementable, HeapSupplementable, and
|
| @@ -215,37 +212,6 @@ public:
|
| }
|
| };
|
|
|
| -// This class is used to make an off-heap class supplementable with supplements
|
| -// that are on-heap, aka. HeapSupplements.
|
| -template<typename T>
|
| -class GC_PLUGIN_IGNORE("http://crbug.com/395036") PersistentHeapSupplementable : public SupplementableBase<T, true> {
|
| -public:
|
| - PersistentHeapSupplementable() : m_root(this) { }
|
| - virtual ~PersistentHeapSupplementable()
|
| - {
|
| - typedef typename SupplementableTraits<T, true>::SupplementMap::iterator SupplementIterator;
|
| - for (SupplementIterator it = this->m_supplements.begin(); it != this->m_supplements.end(); ++it)
|
| - it->value->persistentHostHasBeenDestroyed();
|
| - }
|
| -
|
| - virtual void trace(Visitor* visitor)
|
| - {
|
| - visitor->trace(this->m_supplements);
|
| - SupplementableBase<T, true>::trace(visitor);
|
| - }
|
| -
|
| -private:
|
| - class TraceDelegate : PersistentBase<ThreadLocalPersistents<AnyThread>, TraceDelegate> {
|
| - public:
|
| - TraceDelegate(PersistentHeapSupplementable* owner) : m_owner(owner) { }
|
| - void trace(Visitor* visitor) { m_owner->trace(visitor); }
|
| - private:
|
| - PersistentHeapSupplementable* m_owner;
|
| - };
|
| -
|
| - TraceDelegate m_root;
|
| -};
|
| -
|
| template<typename T>
|
| class Supplement : public SupplementBase<T, false> { };
|
|
|
|
|