Oilpan: Notify supplements of Page and LocalFrame destruction.

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 127 matching lines @@
         return host.requireSupplement(key);
     }
 
     static SupplementBase<T, isGarbageCollected>* from(SupplementableBase<T, isGarbageCollected>* host, const char* key)
     {
         return host ? host->requireSupplement(key) : 0;
     }
 
     virtual void trace(Visitor*) { }
     virtual void willBeDestroyed() { }
+
+    // FIXME: Oilpan: Remove this callback once PersistentHeapSupplementable is removed again.
+    virtual void persistentHostHasBeenDestroyed() { }
 };
 
 template<typename T, bool>
 class SupplementableTracing;
 
 template<typename T>
 class SupplementableTracing<T, true> { };
 
 template<typename T>
 class SupplementableTracing<T, false> { };
@@ skipping 29 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.
+    // FIXME: Oilpan: Make private and remove this ignore once PersistentHeapSupplementable is removed again.
+protected:
     GC_PLUGIN_IGNORE("")
     typename SupplementableTraits<T, isGarbageCollected>::SupplementMap m_supplements;
 
 #if ASSERT_ENABLED
 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>, public GarbageCollectedMixin { };
 
 template<typename T>
 class 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();
+    }
 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;
@@ skipping 11 matching lines @@
 };
 
 template<typename T>
 struct ThreadingTrait<WebCore::SupplementableBase<T, true> > {
     static const ThreadAffinity Affinity = ThreadingTrait<T>::Affinity;
 };
 
 } // namespace WebCore
 
 #endif // Supplementable_h