Oilpan: Move LifecycleNotifier's hierarchy to Oilpan's heap

Source/platform/LifecycleNotifier.h

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2013 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
@@ skipping 16 matching lines @@
 #ifndef LifecycleNotifier_h
 #define LifecycleNotifier_h
 
 #include "platform/LifecycleObserver.h"
 #include "wtf/HashSet.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/TemporaryChange.h"
 
 namespace blink {
 
+// Using a virtual inheritance to resolve a diamond inheritance
+// in ExecutionContext.
 template<typename T>
-class LifecycleNotifier {
+class LifecycleNotifier : public virtual WillBeGarbageCollectedMixin {
 public:
     typedef LifecycleObserver<T> Observer;
     typedef T Context;
 
     virtual ~LifecycleNotifier();
     virtual bool isContextThread() const { return true; }
 
     // notifyContextDestroyed() should be explicitly dispatched from an
     // observed context to notify observers contextDestroyed().
     // At the point of contextDestroyed() is called, m_context is still
     // valid and thus it is safe to use m_context during the notification.
     virtual void notifyContextDestroyed();
 
     // FIXME: this won't need to be virtual anymore.
     virtual void addObserver(Observer*);
     virtual void removeObserver(Observer*);
 
-    virtual void trace(Visitor*) { }
+    virtual void trace(Visitor* visitor)
+    {
+        visitor->trace(m_context);
+        visitor->trace(m_observers);
+    }
 
     bool isIteratingOverObservers() const { return m_iterating != IteratingNone; }
 
 protected:
     explicit LifecycleNotifier(Context* context)
         : m_iterating(IteratingNone)
         , m_context(context)
         , m_didCallContextDestroyed(false)
     {
     }
 
-    Context* context() const { return m_context; }
+    Context* context() const { return m_context.get(); }
 
     enum IterationType {
         IteratingNone,
         IteratingOverAll,
         IteratingOverActiveDOMObjects,
         IteratingOverDocumentObservers,
         IteratingOverPageObservers,
         IteratingOverDOMWindowObservers
     };
 
     IterationType m_iterating;
 
 private:
-    typedef HashSet<Observer*> ObserverSet;
+    typedef WillBeHeapHashSet<RawPtrWillBeMember<Observer>> ObserverSet;
 
     ObserverSet m_observers;
-    Context* m_context;
+    RawPtrWillBeWeakMember<Context> m_context;
     bool m_didCallContextDestroyed;
 };
 
 template<typename T>
 inline LifecycleNotifier<T>::~LifecycleNotifier()
 {
+#if !ENABLE(OILPAN)
     // FIXME: Enable the following ASSERT. Also see a FIXME in Document::detach().
     // ASSERT(!m_observers.size() || m_didCallContextDestroyed);
 
-#if !ENABLE(OILPAN)
     TemporaryChange<IterationType> scope(this->m_iterating, IteratingOverAll);
     for (Observer* observer : m_observers) {
         ASSERT(observer->lifecycleContext() == m_context);
         observer->clearLifecycleContext();
     }
 #endif
 }
 
 template<typename T>
 inline void LifecycleNotifier<T>::notifyContextDestroyed()
 {
     // Don't notify contextDestroyed() twice.
     if (m_didCallContextDestroyed)
         return;
 
     TemporaryChange<IterationType> scope(this->m_iterating, IteratingOverAll);
+#if ENABLE(OILPAN)
+    for (Observer* observer : m_observers) {
+        ASSERT(observer->lifecycleContext() == m_context);
+        observer->contextDestroyed();
+    }
+#else
     Vector<Observer*> snapshotOfObservers;
     copyToVector(m_observers, snapshotOfObservers);
     for (Observer* observer : snapshotOfObservers) {
         // FIXME: Oilpan: At the moment, it's possible that the Observer is
         // destructed during the iteration. Once we enable Oilpan by default
         // for Observers, we can remove the hack by making m_observers
         // a HeapHashSet<WeakMember<Observers>>. (i.e., we can just iterate
         // m_observers without taking a snapshot).
         if (m_observers.contains(observer)) {
             ASSERT(observer->lifecycleContext() == m_context);
             observer->contextDestroyed();
         }
     }
+#endif
     m_didCallContextDestroyed = true;
 }
 
 template<typename T>
 inline void LifecycleNotifier<T>::addObserver(typename LifecycleNotifier<T>::Observer* observer)
 {
     RELEASE_ASSERT(m_iterating != IteratingOverAll);
     m_observers.add(observer);
 }
 
 template<typename T>
 inline void LifecycleNotifier<T>::removeObserver(typename LifecycleNotifier<T>::Observer* observer)
 {
+#if ENABLE(OILPAN)
+    RELEASE_ASSERT(m_iterating != IteratingOverAll);
+#endif
     m_observers.remove(observer);
 }
 
 } // namespace blink
 
 #endif // LifecycleNotifier_h