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

Source/core/dom/ContextLifecycleNotifier.h

Index: Source/core/dom/ContextLifecycleNotifier.h
diff --git a/Source/core/dom/ContextLifecycleNotifier.h b/Source/core/dom/ContextLifecycleNotifier.h
index 4929ade1c60e76066c37489bf4a10673c99f0665..c9dbfa19e985390938cd1e0f2f7b7b2129e215e6 100644
--- a/Source/core/dom/ContextLifecycleNotifier.h
+++ b/Source/core/dom/ContextLifecycleNotifier.h
@@ -28,6 +28,7 @@
 #define ContextLifecycleNotifier_h
 
 #include "core/dom/ActiveDOMObject.h"
+#include "core/dom/LifecycleNotifier.h"
 #include "wtf/HashSet.h"
 #include "wtf/PassOwnPtr.h"
 
@@ -41,19 +42,18 @@ class ActiveDOMObject;
 class ContextLifecycleObserver;
 class ScriptExecutionContext;
 
-class ContextLifecycleNotifier {
+class ContextLifecycleNotifier : public LifecycleNotifier {
 public:
     static PassOwnPtr<ContextLifecycleNotifier> create(ScriptExecutionContext*);
 
     virtual ~ContextLifecycleNotifier();
 
-    typedef HashSet<ContextLifecycleObserver*> ContextObserverSet;
     typedef HashSet<ActiveDOMObject*> ActiveDOMObjectSet;
 
     const ActiveDOMObjectSet& activeDOMObjects() const { return m_activeDOMObjects; }
 
-    virtual void addObserver(ContextLifecycleObserver*, ContextLifecycleObserver::Type as);
-    virtual void removeObserver(ContextLifecycleObserver*, ContextLifecycleObserver::Type as);
+    virtual void addObserver(LifecycleObserver*, LifecycleObserver::Type) OVERRIDE;
+    virtual void removeObserver(LifecycleObserver*, LifecycleObserver::Type) OVERRIDE;

[abarth-chromium, 2013/07/09 18:27:52]

I see.

[Michael van Ouwerkerk, 2013/07/10 13:25:09]

Acknowledged.

 
     void notifyResumingActiveDOMObjects();
     void notifySuspendingActiveDOMObjects(ActiveDOMObject::ReasonForSuspension);
@@ -68,20 +68,8 @@ public:
 protected:
     explicit ContextLifecycleNotifier(ScriptExecutionContext*);
 
-    enum IterationType {
-        IteratingNone,
-        IteratingOverActiveDOMObjects,
-        IteratingOverContextObservers,
-        IteratingOverDocumentObservers
-    };
-
-    IterationType m_iterating;
-
 private:
-    ScriptExecutionContext* m_context;
-    ContextObserverSet m_contextObservers;
     ActiveDOMObjectSet m_activeDOMObjects;
-    bool m_inDestructor;
 };
 
 inline PassOwnPtr<ContextLifecycleNotifier> ContextLifecycleNotifier::create(ScriptExecutionContext* context)
@@ -92,4 +80,3 @@ inline PassOwnPtr<ContextLifecycleNotifier> ContextLifecycleNotifier::create(Scr
 } // namespace WebCore
 
 #endif // ContextLifecycleNotifier_h
-