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

Source/core/dom/ContextLifecycleObserver.cpp

Index: Source/core/dom/ContextLifecycleObserver.cpp
diff --git a/Source/core/dom/ContextLifecycleObserver.cpp b/Source/core/dom/ContextLifecycleObserver.cpp
index 656f54e247681a3801ccc64453bbb68c7ee45ce3..833957b2d70f7ddc8e7e30dcf5a0732ba6408260 100644
--- a/Source/core/dom/ContextLifecycleObserver.cpp
+++ b/Source/core/dom/ContextLifecycleObserver.cpp
@@ -32,7 +32,8 @@
 namespace WebCore {
 
 ContextLifecycleObserver::ContextLifecycleObserver(ScriptExecutionContext* scriptExecutionContext, Type type)
-    : m_scriptExecutionContext(0)
+    : SimpleLifecycleObserver(scriptExecutionContext)
+    , m_scriptExecutionContext(0)
 {
     observeContext(scriptExecutionContext, type);
 }
@@ -43,24 +44,11 @@ ContextLifecycleObserver::~ContextLifecycleObserver()
         observeContext(0, GenericType);
 }
 
-void ContextLifecycleObserver::observeContext(ScriptExecutionContext* scriptExecutionContext, Type as)
-{
-    if (m_scriptExecutionContext) {
-        ASSERT(m_scriptExecutionContext->isContextThread());
-        m_scriptExecutionContext->wasUnobservedBy(this, as);
-    }
-
-    m_scriptExecutionContext = scriptExecutionContext;
-
-    if (m_scriptExecutionContext) {
-        ASSERT(m_scriptExecutionContext->isContextThread());
-        m_scriptExecutionContext->wasObservedBy(this, as);
-    }
-}
-
 void ContextLifecycleObserver::contextDestroyed()
 {
     m_scriptExecutionContext = 0;
+
+    SimpleLifecycleObserver::contextDestroyed();
 }
 
 } // namespace WebCore