summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Source/core/dom/ActiveDOMObject.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/dom/ActiveDOMObject.h')
-rw-r--r--chromium/third_party/WebKit/Source/core/dom/ActiveDOMObject.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/core/dom/ActiveDOMObject.h b/chromium/third_party/WebKit/Source/core/dom/ActiveDOMObject.h
index 1157363cb3b..e35637c4d4c 100644
--- a/chromium/third_party/WebKit/Source/core/dom/ActiveDOMObject.h
+++ b/chromium/third_party/WebKit/Source/core/dom/ActiveDOMObject.h
@@ -29,7 +29,6 @@
#include "core/dom/ContextLifecycleObserver.h"
#include "wtf/Assertions.h"
-#include "wtf/Forward.h"
namespace WebCore {
@@ -40,7 +39,7 @@ public:
// suspendIfNeeded() should be called exactly once after object construction to synchronize
// the suspend state with that in ExecutionContext.
void suspendIfNeeded();
-#if !ASSERT_DISABLED
+#if ASSERT_ENABLED
bool suspendIfNeededCalled() const { return m_suspendIfNeededCalled; }
#endif
@@ -57,6 +56,8 @@ public:
virtual void resume();
virtual void stop();
+ void didMoveToNewExecutionContext(ExecutionContext*);
+
protected:
virtual ~ActiveDOMObject();
@@ -76,7 +77,7 @@ protected:
private:
unsigned m_pendingActivityCount;
-#if !ASSERT_DISABLED
+#if ASSERT_ENABLED
bool m_suspendIfNeededCalled;
#endif
};