Disallow adding ContextLifecycleObservers during iteration.

Source/core/dom/ContextLifecycleNotifier.cpp

 /*
  * 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 15 matching lines @@
  */
 
 #include "config.h"
 #include "core/dom/ContextLifecycleNotifier.h"
 
 #include "core/dom/ActiveDOMObject.h"
 #include "wtf/TemporaryChange.h"
 
 namespace blink {
 
-void ContextLifecycleNotifier::addObserver(ContextLifecycleObserver* observer)
-{
-    LifecycleNotifier<ExecutionContext, ContextLifecycleObserver>::addObserver(observer);
-    if (observer->observerType() == ContextLifecycleObserver::ActiveDOMObjectType)
-        RELEASE_ASSERT(m_iterating != IteratingOverActiveDOMObjects);
-}
-
 void ContextLifecycleNotifier::notifyResumingActiveDOMObjects()
 {
-    TemporaryChange<IterationType> scope(m_iterating, IteratingOverActiveDOMObjects);
+    TemporaryChange<IterationType> scope(m_iterating, IteratingOverAll);
     Vector<ContextLifecycleObserver*> snapshotOfObservers;
     copyToVector(m_observers, snapshotOfObservers);
     for (ContextLifecycleObserver* observer : snapshotOfObservers) {
         // FIXME: Oilpan: At the moment, it's possible that a ActiveDOMObject
         // observer is destructed while iterating. Once we enable Oilpan by default
         // for all LifecycleObserver<T>s, we can remove the hack by making m_observers
         // a HeapHashSet<WeakMember<LifecycleObserver<T>>>.
         // (i.e., we can just iterate m_observers without taking a snapshot).
         // For more details, see https://codereview.chromium.org/247253002/.
         if (m_observers.contains(observer)) {
             if (observer->observerType() != ContextLifecycleObserver::ActiveDOMObjectType)
                 continue;
             ActiveDOMObject* activeDOMObject = static_cast<ActiveDOMObject*>(observer);
             ASSERT(activeDOMObject->executionContext() == context());
             ASSERT(activeDOMObject->suspendIfNeededCalled());
             activeDOMObject->resume();
         }
     }
 }
 
 void ContextLifecycleNotifier::notifySuspendingActiveDOMObjects()
 {
-    TemporaryChange<IterationType> scope(m_iterating, IteratingOverActiveDOMObjects);
+    TemporaryChange<IterationType> scope(m_iterating, IteratingOverAll);
     Vector<ContextLifecycleObserver*> snapshotOfObservers;
     copyToVector(m_observers, snapshotOfObservers);
     for (ContextLifecycleObserver* observer : snapshotOfObservers) {
         // It's possible that the ActiveDOMObject is already destructed.
         // See a FIXME above.
         if (m_observers.contains(observer)) {
             if (observer->observerType() != ContextLifecycleObserver::ActiveDOMObjectType)
                 continue;
             ActiveDOMObject* activeDOMObject = static_cast<ActiveDOMObject*>(observer);
             ASSERT(activeDOMObject->executionContext() == context());
             ASSERT(activeDOMObject->suspendIfNeededCalled());
             activeDOMObject->suspend();
         }
     }
 }
 
 void ContextLifecycleNotifier::notifyStoppingActiveDOMObjects()
 {
-    TemporaryChange<IterationType> scope(m_iterating, IteratingOverActiveDOMObjects);
+    TemporaryChange<IterationType> scope(m_iterating, IteratingOverAll);
     Vector<ContextLifecycleObserver*> snapshotOfObservers;
     copyToVector(m_observers, snapshotOfObservers);
     for (ContextLifecycleObserver* observer : snapshotOfObservers) {
         // It's possible that the ActiveDOMObject is already destructed.
         // See a FIXME above.
         if (m_observers.contains(observer)) {
             if (observer->observerType() != ContextLifecycleObserver::ActiveDOMObjectType)
                 continue;
             ActiveDOMObject* activeDOMObject = static_cast<ActiveDOMObject*>(observer);
             ASSERT(activeDOMObject->executionContext() == context());
@@ skipping 34 matching lines @@
             continue;
         ActiveDOMObject* activeDOMObject = static_cast<ActiveDOMObject*>(observer);
         if (activeDOMObject == object)
             return true;
     }
     return false;
 }
 #endif
 
 } // namespace blink