Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / ActiveDOMObject.h

diff --git a/src/third_party/WebKit/Source/core/dom/ActiveDOMObject.h b/src/third_party/WebKit/Source/core/dom/ActiveDOMObject.h
index 67b5e82..6adfb60 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/ActiveDOMObject.h
+++ b/src/third_party/WebKit/Source/core/dom/ActiveDOMObject.h
@@ -44,12 +44,24 @@ public:
     bool suspendIfNeededCalled() const { return m_suspendIfNeededCalled; }
 #endif
 
+    // Should return true if there's any pending asynchronous activity, and so
+    // this object must not be garbage collected.
+    //
+    // Default implementation is that it returns true iff
+    // m_pendingActivityCount is non-zero.
     virtual bool hasPendingActivity() const;
 
+    // These methods have an empty default implementation so that subclasses
+    // which don't need special treatment can skip implementation.
     virtual void suspend();
     virtual void resume();
     virtual void stop();
 
+    void didMoveToNewExecutionContext(ExecutionContext*);
+
+protected:
+    virtual ~ActiveDOMObject();
+
     template<class T> void setPendingActivity(T* thisObject)
     {
         ASSERT(thisObject == this);
@@ -64,9 +76,6 @@ public:
         thisObject->deref();
     }
 
-protected:
-    virtual ~ActiveDOMObject();
-
 private:
     unsigned m_pendingActivityCount;
 #if !ASSERT_DISABLED