Explictly clear LifecycleObserver's context

third_party/WebKit/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 42 matching lines @@
 #if ENABLE(OILPAN)
         visitor->trace(m_observers);
 #endif
     }
 
     bool isIteratingOverObservers() const { return m_iterating != IteratingNone; }
 
 protected:
     LifecycleNotifier()
         : m_iterating(IteratingNone)
-        , m_didCallContextDestroyed(false)
     {
     }
 
     enum IterationType {
         IteratingNone,
         IteratingOverAll,
     };
 
     IterationType m_iterating;
 
 protected:
     using ObserverSet = WillBeHeapHashSet<RawPtrWillBeWeakMember<Observer>>;
 
     ObserverSet m_observers;
 
 #if ENABLE(ASSERT)
     T* context() { return static_cast<T*>(this); }
 #endif
-
-private:
-    bool m_didCallContextDestroyed;
 };
 
 template<typename T, typename Observer>
 inline LifecycleNotifier<T, Observer>::~LifecycleNotifier()
 {
     // FIXME: Enable the following ASSERT. Also see a FIXME in Document::detach().
-    // ASSERT(!m_observers.size() || m_didCallContextDestroyed);
+    // ASSERT(!m_observers.size());
 
 #if !ENABLE(OILPAN)
     TemporaryChange<IterationType> scope(m_iterating, IteratingOverAll);
     for (Observer* observer : m_observers) {
         observer->clearLifecycleContext();
     }
 #endif
 }
 
 template<typename T, typename Observer>
 inline void LifecycleNotifier<T, Observer>::notifyContextDestroyed()
 {
     // Don't notify contextDestroyed() twice.
-    if (m_didCallContextDestroyed)
+    if (m_observers.isEmpty())
         return;
 
     TemporaryChange<IterationType> scope(m_iterating, IteratingOverAll);
     Vector<RawPtrWillBeUntracedMember<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 *and*
         // Observer::contextDestroyed() does not call removeObserver(),
         // 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() == context());
             observer->contextDestroyed();
+            observer->clearLifecycleContext();
         }
     }
-
-    m_didCallContextDestroyed = true;
+    m_observers.clear();
 }
 
 template<typename T, typename Observer>
 inline void LifecycleNotifier<T, Observer>::addObserver(Observer* observer)
 {
     RELEASE_ASSERT(m_iterating != IteratingOverAll);
     m_observers.add(observer);
 }
 
 template<typename T, typename Observer>
 inline void LifecycleNotifier<T, Observer>::removeObserver(Observer* observer)
 {
     m_observers.remove(observer);
 }
 
 } // namespace blink
 
 #endif // LifecycleNotifier_h