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

Source/core/dom/ContextLifecycleObserver.cpp

 /*
  * Copyright (C) 2008 Apple 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 14 matching lines @@
  */
 
 #include "config.h"
 #include "core/dom/ContextLifecycleObserver.h"
 
 #include "core/dom/ScriptExecutionContext.h"
 
 namespace WebCore {
 
 ContextLifecycleObserver::ContextLifecycleObserver(ScriptExecutionContext* scriptExecutionContext, Type type)
-    : m_scriptExecutionContext(0)
+    : LifecycleObserver(scriptExecutionContext)
+    , m_scriptExecutionContext(0)
 {
     observeContext(scriptExecutionContext, type);
 }
 
 ContextLifecycleObserver::~ContextLifecycleObserver()
 {
     if (m_scriptExecutionContext)
         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;
+    m_lifecycleContext = scriptExecutionContext;
 
     if (m_scriptExecutionContext) {
         ASSERT(m_scriptExecutionContext->isContextThread());
         m_scriptExecutionContext->wasObservedBy(this, as);
     }
 }
 
 void ContextLifecycleObserver::contextDestroyed()
 {
     m_scriptExecutionContext = 0;
+
+    LifecycleObserver::contextDestroyed();
 }
 
 } // namespace WebCore