Extract simpler classes for observing context lifecycle and observe Page lifecycle inNavigatorVibra…

Source/core/dom/DocumentLifecycleObserver.cpp

Index: Source/core/dom/DocumentLifecycleObserver.cpp
diff --git a/Source/core/dom/DocumentLifecycleObserver.cpp b/Source/core/dom/DocumentLifecycleObserver.cpp
index 2af13c08531a6aaa51c6395850974df2e5b2a747..ee456885bbce9691c6dde1452e44e26ff99d7a14 100644
--- a/Source/core/dom/DocumentLifecycleObserver.cpp
+++ b/Source/core/dom/DocumentLifecycleObserver.cpp
@@ -46,24 +46,24 @@ DocumentLifecycleNotifier::DocumentLifecycleNotifier(ScriptExecutionContext* con
 {
 }
 
-void DocumentLifecycleNotifier::addObserver(ContextLifecycleObserver* observer, ContextLifecycleObserver::Type as)
+void DocumentLifecycleNotifier::addObserver(LifecycleObserver* observer, LifecycleObserver::Type type)
 {
-    if (as == ContextLifecycleObserver::DocumentLifecycleObserverType) {
+    if (type == LifecycleObserver::DocumentLifecycleObserverType) {
         RELEASE_ASSERT(m_iterating != IteratingOverDocumentObservers);
         m_documentObservers.add(static_cast<DocumentLifecycleObserver*>(observer));
     }
 
-    ContextLifecycleNotifier::addObserver(observer, as);
+    ContextLifecycleNotifier::addObserver(observer, type);
 }
 
-void DocumentLifecycleNotifier::removeObserver(ContextLifecycleObserver* observer, ContextLifecycleObserver::Type as)
+void DocumentLifecycleNotifier::removeObserver(LifecycleObserver* observer, LifecycleObserver::Type type)
 {
-    if (as == ContextLifecycleObserver::DocumentLifecycleObserverType) {
+    if (type == LifecycleObserver::DocumentLifecycleObserverType) {
         RELEASE_ASSERT(m_iterating != IteratingOverDocumentObservers);
         m_documentObservers.remove(static_cast<DocumentLifecycleObserver*>(observer));
     }
 
-    ContextLifecycleNotifier::removeObserver(observer, as);
+    ContextLifecycleNotifier::removeObserver(observer, type);
 }
 
 } // namespace WebCore