Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: Source/core/dom/ContextLifecycleNotifier.cpp

Issue 1024543004: Disallow adding ContextLifecycleObservers during iteration. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: tidier LifecycleObserver ctor Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/ContextLifecycleNotifier.h ('k') | Source/core/dom/ContextLifecycleObserver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ContextLifecycleNotifier.cpp
diff --git a/Source/core/dom/ContextLifecycleNotifier.cpp b/Source/core/dom/ContextLifecycleNotifier.cpp
index b320d0f63013c506668e93049f0ffe3582d06ab8..7ce7a1e25bbee4d0b8d054840842f8dc41271571 100644
--- a/Source/core/dom/ContextLifecycleNotifier.cpp
+++ b/Source/core/dom/ContextLifecycleNotifier.cpp
@@ -33,16 +33,9 @@
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) {
@@ -65,7 +58,7 @@ void ContextLifecycleNotifier::notifyResumingActiveDOMObjects()
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) {
@@ -84,7 +77,7 @@ void ContextLifecycleNotifier::notifySuspendingActiveDOMObjects()
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) {
« no previous file with comments | « Source/core/dom/ContextLifecycleNotifier.h ('k') | Source/core/dom/ContextLifecycleObserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698