Changeset 98784 in webkit

Timestamp:

Oct 28, 2011, 4:57:21 PM (15 years ago)

Author:

abarth@webkit.org

Message:

Factor ContextDestructionObserver out of ActiveDOMObject
​https://bugs.webkit.org/show_bug.cgi?id=71153

Reviewed by Sam Weinig.

This patch paves the way to make more objects observe the destruction
of ScriptExecutioContext without needing to add ifdefs to
ScriptExecutionContext.h/cpp. (As an example, see DOMURL.)

• dom/ActiveDOMObject.cpp:

(WebCore::ContextDestructionObserver::ContextDestructionObserver):
(WebCore::ContextDestructionObserver::~ContextDestructionObserver):
(WebCore::ContextDestructionObserver::contextDestroyed):
(WebCore::ActiveDOMObject::ActiveDOMObject):
(WebCore::ActiveDOMObject::~ActiveDOMObject):

• dom/ActiveDOMObject.h:

(WebCore::ContextDestructionObserver::scriptExecutionContext):

• dom/ScriptExecutionContext.cpp:

(WebCore::ScriptExecutionContext::~ScriptExecutionContext):
(WebCore::ScriptExecutionContext::didCreateActiveDOMObject):
(WebCore::ScriptExecutionContext::willDestroyActiveDOMObject):
(WebCore::didCreateDestructionObserver):
(WebCore::willDestroyDestructionObserver):

• dom/ScriptExecutionContext.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ActiveDOMObject.cpp (modified) (2 diffs)
• dom/ActiveDOMObject.h (modified) (2 diffs)
• dom/ScriptExecutionContext.cpp (modified) (4 diffs)
• dom/ScriptExecutionContext.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  Adam Barth  <abarth@webkit.org>
+
+        Factor ContextDestructionObserver out of ActiveDOMObject
+        https://bugs.webkit.org/show_bug.cgi?id=71153
+
+        Reviewed by Sam Weinig.
+
+        This patch paves the way to make more objects observe the destruction
+        of ScriptExecutioContext without needing to add ifdefs to
+        ScriptExecutionContext.h/cpp.  (As an example, see DOMURL.)
+
+        * dom/ActiveDOMObject.cpp:
+        (WebCore::ContextDestructionObserver::ContextDestructionObserver):
+        (WebCore::ContextDestructionObserver::~ContextDestructionObserver):
+        (WebCore::ContextDestructionObserver::contextDestroyed):
+        (WebCore::ActiveDOMObject::ActiveDOMObject):
+        (WebCore::ActiveDOMObject::~ActiveDOMObject):
+        * dom/ActiveDOMObject.h:
+        (WebCore::ContextDestructionObserver::scriptExecutionContext):
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
+        (WebCore::ScriptExecutionContext::didCreateActiveDOMObject):
+        (WebCore::ScriptExecutionContext::willDestroyActiveDOMObject):
+        (WebCore::didCreateDestructionObserver):
+        (WebCore::willDestroyDestructionObserver):
+        * dom/ScriptExecutionContext.h:
+
 2011-10-28  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/dom/ActiveDOMObject.cpp

@@ -34 +34 @@
 namespace WebCore {
 
+ContextDestructionObserver::ContextDestructionObserver(ScriptExecutionContext* scriptExecutionContext)
+    : m_scriptExecutionContext(scriptExecutionContext)
+{
+    if (!m_scriptExecutionContext)
+        return;
+
+    ASSERT(m_scriptExecutionContext->isContextThread());
+    m_scriptExecutionContext->didCreateDestructionObserver(this);
+}
+
+ContextDestructionObserver::~ContextDestructionObserver()
+{
+    if (!m_scriptExecutionContext)
+        return;
+
+    ASSERT(m_scriptExecutionContext->isContextThread());
+    m_scriptExecutionContext->willDestroyDestructionObserver(this);
+}
+
+void ContextDestructionObserver::contextDestroyed()
+{
+    m_scriptExecutionContext = 0;
+}
+
 ActiveDOMObject::ActiveDOMObject(ScriptExecutionContext* scriptExecutionContext, void* upcastPointer)
-    : m_scriptExecutionContext(scriptExecutionContext)
+    : ContextDestructionObserver(scriptExecutionContext)
     , m_pendingActivityCount(0)
 {
-    if (m_scriptExecutionContext) {
-        ASSERT(m_scriptExecutionContext->isContextThread());
-        m_scriptExecutionContext->createdActiveDOMObject(this, upcastPointer);
-    }
+    if (!m_scriptExecutionContext)
+        return;
+
+    ASSERT(m_scriptExecutionContext->isContextThread());
+    m_scriptExecutionContext->didCreateActiveDOMObject(this, upcastPointer);
 }
 
 ActiveDOMObject::~ActiveDOMObject()
 {
-    if (m_scriptExecutionContext) {
-        ASSERT(m_scriptExecutionContext->isContextThread());
-        m_scriptExecutionContext->destroyedActiveDOMObject(this);
-    }
+    if (!m_scriptExecutionContext)
+        return;
+
+    ASSERT(m_scriptExecutionContext->isContextThread());
+    m_scriptExecutionContext->willDestroyActiveDOMObject(this);
 }
 
@@ -55 +81 @@
 {
     return m_pendingActivityCount;
-}
-
-void ActiveDOMObject::contextDestroyed()
-{
-    m_scriptExecutionContext = 0;
 }
 

trunk/Source/WebCore/dom/ActiveDOMObject.h

@@ -34 +34 @@
     class ScriptExecutionContext;
 
-    class ActiveDOMObject {
+    // FIXME: Move this class to it's own file.
+    class ContextDestructionObserver {
+    public:
+        ContextDestructionObserver(ScriptExecutionContext*);
+        virtual void contextDestroyed();
+
+        ScriptExecutionContext* scriptExecutionContext() const { return m_scriptExecutionContext; }
+
+    protected:
+        virtual ~ContextDestructionObserver();
+
+        ScriptExecutionContext* m_scriptExecutionContext;
+    };
+
+    class ActiveDOMObject : public ContextDestructionObserver {
     public:
         ActiveDOMObject(ScriptExecutionContext*, void* upcastPointer);
 
-        ScriptExecutionContext* scriptExecutionContext() const { return m_scriptExecutionContext; }
         virtual bool hasPendingActivity() const;
-
-        virtual void contextDestroyed();
 
         // canSuspend() is used by the caller if there is a choice between suspending and stopping.
@@ -77 +88 @@
 
     private:
-        ScriptExecutionContext* m_scriptExecutionContext;
         unsigned m_pendingActivityCount;
     };

trunk/Source/WebCore/dom/ScriptExecutionContext.cpp

@@ -105 +105 @@
 {
     m_inDestructor = true;
-    for (HashMap<ActiveDOMObject*, void*>::iterator iter = m_activeDOMObjects.begin(); iter != m_activeDOMObjects.end(); iter = m_activeDOMObjects.begin()) {
-        ActiveDOMObject* object = iter->first;
-        m_activeDOMObjects.remove(iter);
-        ASSERT(object->scriptExecutionContext() == this);
-        object->contextDestroyed();
+
+    for (HashSet<ContextDestructionObserver*>::iterator iter = m_destructionObservers.begin(); iter != m_destructionObservers.end(); iter = m_destructionObservers.begin()) {
+        ContextDestructionObserver* observer = *iter;
+        m_destructionObservers.remove(observer);
+        ASSERT(observer->scriptExecutionContext() == this);
+        observer->contextDestroyed();
     }
 
@@ -289 +290 @@
 }
 
-void ScriptExecutionContext::createdActiveDOMObject(ActiveDOMObject* object, void* upcastPointer)
+void ScriptExecutionContext::didCreateActiveDOMObject(ActiveDOMObject* object, void* upcastPointer)
 {
     ASSERT(object);
@@ -299 +300 @@
 }
 
-void ScriptExecutionContext::destroyedActiveDOMObject(ActiveDOMObject* object)
+void ScriptExecutionContext::willDestroyActiveDOMObject(ActiveDOMObject* object)
 {
     ASSERT(object);
@@ -305 +306 @@
         CRASH();
     m_activeDOMObjects.remove(object);
+}
+
+void ScriptExecutionContext::didCreateDestructionObserver(ContextDestructionObserver* observer)
+{
+    ASSERT(observer);
+    ASSERT(!m_inDestructor);
+    m_destructionObservers.add(observer);
+}
+
+void ScriptExecutionContext::willDestroyDestructionObserver(ContextDestructionObserver* observer)
+{
+    ASSERT(observer);
+    m_destructionObservers.remove(observer);
 }
 

trunk/Source/WebCore/dom/ScriptExecutionContext.h

@@ -115 +115 @@
     virtual void stopActiveDOMObjects();
 
-    void createdActiveDOMObject(ActiveDOMObject*, void* upcastPointer);
-    void destroyedActiveDOMObject(ActiveDOMObject*);
+    void didCreateActiveDOMObject(ActiveDOMObject*, void* upcastPointer);
+    void willDestroyActiveDOMObject(ActiveDOMObject*);
+
     typedef const HashMap<ActiveDOMObject*, void*> ActiveDOMObjectsMap;
     ActiveDOMObjectsMap& activeDOMObjects() const { return m_activeDOMObjects; }
+
+    void didCreateDestructionObserver(ContextDestructionObserver*);
+    void willDestroyDestructionObserver(ContextDestructionObserver*);
 
     virtual void suspendScriptedAnimationControllerCallbacks() { }
@@ -200 +204 @@
 
     HashSet<MessagePort*> m_messagePorts;
-
+    HashSet<ContextDestructionObserver*> m_destructionObservers;
     HashMap<ActiveDOMObject*, void*> m_activeDOMObjects;
     bool m_iteratingActiveDOMObjects;