Simplify lifecycle notifiers and observers.

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 16 matching lines @@
 
 #include "config.h"
 #include "core/dom/ContextLifecycleNotifier.h"
 
 #include "core/dom/ActiveDOMObject.h"
 #include "wtf/TemporaryChange.h"
 
 namespace blink {
 
 ContextLifecycleNotifier::ContextLifecycleNotifier(ExecutionContext* context)
-    : LifecycleNotifier<ExecutionContext>(context)
+    : LifecycleNotifier<ExecutionContext, ContextLifecycleObserver>(context)
 {
 }
 
-void ContextLifecycleNotifier::addObserver(ContextLifecycleNotifier::Observer* observer)
+void ContextLifecycleNotifier::addObserver(ContextLifecycleObserver* observer)
 {
-    LifecycleNotifier<ExecutionContext>::addObserver(observer);
-
-    if (observer->observerType() == Observer::ActiveDOMObjectType) {
+    LifecycleNotifier<ExecutionContext, ContextLifecycleObserver>::addObserver(observer);
+    if (observer->observerType() == ContextLifecycleObserver::ActiveDOMObjectType) {
         RELEASE_ASSERT(m_iterating != IteratingOverActiveDOMObjects);
         m_activeDOMObjects.add(static_cast<ActiveDOMObject*>(observer));
     }
 }
 
-void ContextLifecycleNotifier::removeObserver(ContextLifecycleNotifier::Observer* observer)
+void ContextLifecycleNotifier::removeObserver(ContextLifecycleObserver* observer)
 {
-    LifecycleNotifier<ExecutionContext>::removeObserver(observer);
-
-    if (observer->observerType() == Observer::ActiveDOMObjectType) {
+    LifecycleNotifier<ExecutionContext, ContextLifecycleObserver>::removeObserver(observer);
+    if (observer->observerType() == ContextLifecycleObserver::ActiveDOMObjectType)
         m_activeDOMObjects.remove(static_cast<ActiveDOMObject*>(observer));
-    }
 }
 
 void ContextLifecycleNotifier::notifyResumingActiveDOMObjects()
 {
-    TemporaryChange<IterationType> scope(this->m_iterating, IteratingOverActiveDOMObjects);
+    TemporaryChange<IterationType> scope(m_iterating, IteratingOverActiveDOMObjects);
     Vector<ActiveDOMObject*> snapshotOfActiveDOMObjects;
     copyToVector(m_activeDOMObjects, snapshotOfActiveDOMObjects);
     for (ActiveDOMObject* obj : snapshotOfActiveDOMObjects) {
         // FIXME: Oilpan: At the moment, it's possible that the ActiveDOMObject
         // is destructed during the iteration. Once we enable Oilpan by default
         // for ActiveDOMObjects, we can remove the hack by making
-        // m_activeDOMObjects a HeapHashSet<WeakMember<ActiveDOMObjects>>.
+        // m_activeDOMObjects a HeapHashSet<WeakMember<ActiveDOMObject>>.
         // (i.e., we can just iterate m_activeDOMObjects without taking
         // a snapshot).
         // For more details, see https://codereview.chromium.org/247253002/.
         if (m_activeDOMObjects.contains(obj)) {
             ASSERT(obj->executionContext() == context());
             ASSERT(obj->suspendIfNeededCalled());
             obj->resume();
         }
     }
 }
 
 void ContextLifecycleNotifier::notifySuspendingActiveDOMObjects()
 {
-    TemporaryChange<IterationType> scope(this->m_iterating, IteratingOverActiveDOMObjects);
+    TemporaryChange<IterationType> scope(m_iterating, IteratingOverActiveDOMObjects);
     Vector<ActiveDOMObject*> snapshotOfActiveDOMObjects;
     copyToVector(m_activeDOMObjects, snapshotOfActiveDOMObjects);
     for (ActiveDOMObject* obj : snapshotOfActiveDOMObjects) {
         // It's possible that the ActiveDOMObject is already destructed.
         // See a FIXME above.
         if (m_activeDOMObjects.contains(obj)) {
             ASSERT(obj->executionContext() == context());
             ASSERT(obj->suspendIfNeededCalled());
             obj->suspend();
         }
     }
 }
 
 void ContextLifecycleNotifier::notifyStoppingActiveDOMObjects()
 {
-    TemporaryChange<IterationType> scope(this->m_iterating, IteratingOverActiveDOMObjects);
+    TemporaryChange<IterationType> scope(m_iterating, IteratingOverActiveDOMObjects);
     Vector<ActiveDOMObject*> snapshotOfActiveDOMObjects;
     copyToVector(m_activeDOMObjects, snapshotOfActiveDOMObjects);
     for (ActiveDOMObject* obj : snapshotOfActiveDOMObjects) {
         // It's possible that the ActiveDOMObject is already destructed.
         // See a FIXME above.
         if (m_activeDOMObjects.contains(obj)) {
             ASSERT(obj->executionContext() == context());
             ASSERT(obj->suspendIfNeededCalled());
             obj->stop();
         }
     }
 }
 
 bool ContextLifecycleNotifier::hasPendingActivity() const
 {
     for (ActiveDOMObject* obj : m_activeDOMObjects) {
         if (obj->hasPendingActivity())
             return true;
     }
     return false;
 }
 
 } // namespace blink