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

Source/core/dom/SimpleLifecycleObserver.cpp

Index: Source/core/dom/SimpleLifecycleObserver.cpp
diff --git a/Source/core/dom/ContextLifecycleObserver.cpp b/Source/core/dom/SimpleLifecycleObserver.cpp
similarity index 61%
copy from Source/core/dom/ContextLifecycleObserver.cpp
copy to Source/core/dom/SimpleLifecycleObserver.cpp
index 656f54e247681a3801ccc64453bbb68c7ee45ce3..b311cef68c6117d38c3167551111298731572eb8 100644
--- a/Source/core/dom/ContextLifecycleObserver.cpp
+++ b/Source/core/dom/SimpleLifecycleObserver.cpp
@@ -25,42 +25,42 @@
  */
 
 #include "config.h"
-#include "core/dom/ContextLifecycleObserver.h"
+#include "core/dom/SimpleLifecycleObserver.h"
 
-#include "core/dom/ScriptExecutionContext.h"
+#include "core/dom/SimpleLifecycleContext.h"
 
 namespace WebCore {
 
-ContextLifecycleObserver::ContextLifecycleObserver(ScriptExecutionContext* scriptExecutionContext, Type type)
-    : m_scriptExecutionContext(0)
+SimpleLifecycleObserver::SimpleLifecycleObserver(SimpleLifecycleContext* simpleLifecycleContext, Type type)
+    : m_simpleLifecycleContext(0)
 {
-    observeContext(scriptExecutionContext, type);
+    observeContext(simpleLifecycleContext, type);
 }
 
-ContextLifecycleObserver::~ContextLifecycleObserver()
+SimpleLifecycleObserver::~SimpleLifecycleObserver()
 {
-    if (m_scriptExecutionContext)
+    if (m_simpleLifecycleContext)
         observeContext(0, GenericType);
 }
 
-void ContextLifecycleObserver::observeContext(ScriptExecutionContext* scriptExecutionContext, Type as)
+void SimpleLifecycleObserver::observeContext(SimpleLifecycleContext* context, Type type)
 {
-    if (m_scriptExecutionContext) {
-        ASSERT(m_scriptExecutionContext->isContextThread());
-        m_scriptExecutionContext->wasUnobservedBy(this, as);
+    if (m_simpleLifecycleContext) {
+        ASSERT(m_simpleLifecycleContext->isContextThread());
+        m_simpleLifecycleContext->wasUnobservedBy(this, type);
     }
 
-    m_scriptExecutionContext = scriptExecutionContext;
+    m_simpleLifecycleContext = context;
 
-    if (m_scriptExecutionContext) {
-        ASSERT(m_scriptExecutionContext->isContextThread());
-        m_scriptExecutionContext->wasObservedBy(this, as);
+    if (m_simpleLifecycleContext) {
+        ASSERT(m_simpleLifecycleContext->isContextThread());
+        m_simpleLifecycleContext->wasObservedBy(this, type);
     }
 }
 
-void ContextLifecycleObserver::contextDestroyed()
+void SimpleLifecycleObserver::contextDestroyed()
 {
-    m_scriptExecutionContext = 0;
+    m_simpleLifecycleContext = 0;
 }
 
 } // namespace WebCore