Oilpan: Make LocalFrame PersistentHeapSupplementable and use transition types for its supplements.

Source/platform/Supplementable.h

 /*
  * Copyright (C) 2012 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 133 matching lines @@
     }
 
     virtual void trace(Visitor*) { }
     virtual void willBeDestroyed() { }
 };
 
 template<typename T, bool>
 class SupplementableTracing;
 
 template<typename T>
-class SupplementableTracing<T, true> : public GarbageCollectedMixin { };
+class SupplementableTracing<T, true> { };
 
 template<typename T>
 class SupplementableTracing<T, false> { };
 
 template<typename T, bool isGarbageCollected = false>
 class SupplementableBase : public SupplementableTracing<T, isGarbageCollected> {
 public:
     void provideSupplement(const char* key, typename SupplementableTraits<T, isGarbageCollected>::SupplementArgumentType supplement)
     {
         ASSERT(m_threadId == currentThread());
@@ skipping 23 matching lines @@
     virtual void trace(Visitor* visitor) { visitor->trace(m_supplements); }
 
     void willBeDestroyed()
     {
         typedef typename SupplementableTraits<T, isGarbageCollected>::SupplementMap::iterator SupplementIterator;
         for (SupplementIterator it = m_supplements.begin(); it != m_supplements.end(); ++it)
             it->value->willBeDestroyed();
     }
 
 private:
+    // FIXME: Oilpan: Remove this ignore once PersistentHeapSupplementable is removed again.
+    GC_PLUGIN_IGNORE("")
     typename SupplementableTraits<T, isGarbageCollected>::SupplementMap m_supplements;
 
 #if !ASSERT_DISABLED
 protected:
     SupplementableBase() : m_threadId(currentThread()) { }
 
 private:
     ThreadIdentifier m_threadId;
 #endif
 };
 
 template<typename T>
 class HeapSupplement : public SupplementBase<T, true> { };
 
+// FIXME: Oilpan: Move GarbageCollectedMixin to SupplementableBase<T, true> once PersistentHeapSupplementable is removed again.
 template<typename T>
-class HeapSupplementable : public SupplementableBase<T, true> { };
+class HeapSupplementable : public SupplementableBase<T, true>, public GarbageCollectedMixin { };
+
+template<typename T>
+class PersistentHeapSupplementable : public SupplementableBase<T, true> {
+public:
+    PersistentHeapSupplementable() : m_root(this) { }
+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> { };
 
 template<typename T>
 class Supplementable : public SupplementableBase<T, false> { };
 
 template<typename T>
 struct ThreadingTrait<WebCore::SupplementBase<T, true> > {
     static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity;
 };
 
 template<typename T>
 struct ThreadingTrait<WebCore::SupplementableBase<T, true> > {
     static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity;
 };
 
 } // namespace WebCore
 
 #endif // Supplementable_h