Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Unified Diff: Source/core/dom/ActiveDOMObject.cpp

Issue 916033002: Oilpan: Move LifecycleNotifier's hierarchy to Oilpan's heap Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/bindings/core/v8/V8ScriptRunner.cpp ('k') | Source/core/dom/ContextLifecycleNotifier.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ActiveDOMObject.cpp
diff --git a/Source/core/dom/ActiveDOMObject.cpp b/Source/core/dom/ActiveDOMObject.cpp
index 2d6157f388e6cda2c835ae6e9d7c790ed373d0de..1dd19457451f77f67bc44230ac0de56ff6b3e3c6 100644
--- a/Source/core/dom/ActiveDOMObject.cpp
+++ b/Source/core/dom/ActiveDOMObject.cpp
@@ -42,6 +42,7 @@ ActiveDOMObject::ActiveDOMObject(ExecutionContext* executionContext)
ActiveDOMObject::~ActiveDOMObject()
{
+#if !ENABLE(OILPAN)
// ActiveDOMObject may be inherited by a sub-class whose life-cycle
// exceeds that of the associated ExecutionContext. In those cases,
// m_executionContext would/should have been nullified by
@@ -53,6 +54,7 @@ ActiveDOMObject::~ActiveDOMObject()
ASSERT(m_suspendIfNeededCalled);
ASSERT(executionContext()->isContextThread());
+#endif
}
void ActiveDOMObject::suspendIfNeeded()
« no previous file with comments | « Source/bindings/core/v8/V8ScriptRunner.cpp ('k') | Source/core/dom/ContextLifecycleNotifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698