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

Source/core/dom/DocumentLifecycleObserver.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 28 matching lines @@
 DocumentLifecycleObserver::~DocumentLifecycleObserver()
 {
     observeContext(0, DocumentLifecycleObserverType);
 }
 
 DocumentLifecycleNotifier::DocumentLifecycleNotifier(ScriptExecutionContext* context)
     : ContextLifecycleNotifier(context)
 {
 }
 
-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