Simplify lifecycle notifiers and observers.

Source/core/dom/DocumentLifecycleNotifier.cpp

 /*
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 
 #include "config.h"
 #include "core/dom/DocumentLifecycleNotifier.h"
 
 #include "core/dom/DocumentLifecycleObserver.h"
-#include "wtf/Assertions.h"
 
 namespace blink {
 
 DocumentLifecycleNotifier::DocumentLifecycleNotifier(Document* document)
-    : LifecycleNotifier<Document>(document)
+    : LifecycleNotifier<Document, DocumentLifecycleObserver>(document)
 {
 }
 
-void DocumentLifecycleNotifier::addObserver(DocumentLifecycleNotifier::Observer* observer)
+void DocumentLifecycleNotifier::addObserver(DocumentLifecycleObserver* observer)
 {
-    if (observer->observerType() == Observer::DocumentLifecycleObserverType) {
-        RELEASE_ASSERT(m_iterating != IteratingOverDocumentObservers);
-        m_documentObservers.add(static_cast<DocumentLifecycleObserver*>(observer));
-    }
-
-    LifecycleNotifier<Document>::addObserver(observer);
+    LifecycleNotifier<Document, DocumentLifecycleObserver>::addObserver(observer);
 }
 
-void DocumentLifecycleNotifier::removeObserver(DocumentLifecycleNotifier::Observer* observer)
+void DocumentLifecycleNotifier::removeObserver(DocumentLifecycleObserver* observer)
 {
-    if (observer->observerType() == Observer::DocumentLifecycleObserverType) {
-        RELEASE_ASSERT(m_iterating != IteratingOverDocumentObservers);
-        m_documentObservers.remove(static_cast<DocumentLifecycleObserver*>(observer));
-    }
-
-    LifecycleNotifier<Document>::removeObserver(observer);
+    LifecycleNotifier<Document, DocumentLifecycleObserver>::removeObserver(observer);
 }
 
 void DocumentLifecycleNotifier::notifyDocumentWasDetached()
 {
-    TemporaryChange<IterationType> scope(m_iterating, IteratingOverDocumentObservers);
-    for (DocumentLifecycleObserver* observer : m_documentObservers)
+    TemporaryChange<IterationType> scope(m_iterating, IteratingOverAll);
+    for (DocumentLifecycleObserver* observer : m_observers)
         observer->documentWasDetached();
 }
 
 #if !ENABLE(OILPAN)
 void DocumentLifecycleNotifier::notifyDocumentWasDisposed()
 {
-    TemporaryChange<IterationType> scope(m_iterating, IteratingOverDocumentObservers);
-    for (DocumentLifecycleObserver* observer : m_documentObservers)
+    TemporaryChange<IterationType> scope(m_iterating, IteratingOverAll);
+    for (DocumentLifecycleObserver* observer : m_observers)
         observer->documentWasDisposed();
 }
 #endif
 
 } // namespace blink