third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp - Issue 1854423002: ASSERT -> {DCHECK|DCHECK_XX}, ENABLE(ASSERT) -> DCHECK_IS_ON() in dom

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp

Issue 1854423002: ASSERT -> {DCHECK|DCHECK_XX}, ENABLE(ASSERT) -> DCHECK_IS_ON() in dom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: mark svg/as-image/svg-nested.html crash on win Created 4 years, 8 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 | « third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.h ('k') | third_party/WebKit/Source/core/dom/DOMArrayBuffer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp

diff --git a/third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp b/third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp

index a59a8b41833ec86b8c4ed79396fb6240d8de976d..38a035cfbf25fb11f831e8ec9c8c943291b1ab74 100644

--- a/third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp

+++ b/third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp

@@ -48,8 +48,10 @@ void ContextLifecycleNotifier::notifyResumingActiveDOMObjects()

if (observer->observerType() != ContextLifecycleObserver::ActiveDOMObjectType)

continue;

ActiveDOMObject* activeDOMObject = static_cast<ActiveDOMObject*>(observer);

- ASSERT(activeDOMObject->getExecutionContext() == context());

- ASSERT(activeDOMObject->suspendIfNeededCalled());

+#if DCHECK_IS_ON()

+ DCHECK_EQ(activeDOMObject->getExecutionContext(), context());

+ DCHECK(activeDOMObject->suspendIfNeededCalled());

+#endif

activeDOMObject->resume();

}

@@ -67,8 +69,10 @@ void ContextLifecycleNotifier::notifySuspendingActiveDOMObjects()

if (observer->observerType() != ContextLifecycleObserver::ActiveDOMObjectType)

continue;

ActiveDOMObject* activeDOMObject = static_cast<ActiveDOMObject*>(observer);

- ASSERT(activeDOMObject->getExecutionContext() == context());

- ASSERT(activeDOMObject->suspendIfNeededCalled());

+#if DCHECK_IS_ON()

+ DCHECK_EQ(activeDOMObject->getExecutionContext(), context());

+ DCHECK(activeDOMObject->suspendIfNeededCalled());

+#endif

activeDOMObject->suspend();

}

@@ -86,8 +90,10 @@ void ContextLifecycleNotifier::notifyStoppingActiveDOMObjects()

if (observer->observerType() != ContextLifecycleObserver::ActiveDOMObjectType)

continue;

ActiveDOMObject* activeDOMObject = static_cast<ActiveDOMObject*>(observer);

- ASSERT(activeDOMObject->getExecutionContext() == context());

- ASSERT(activeDOMObject->suspendIfNeededCalled());

+#if DCHECK_IS_ON()

+ DCHECK_EQ(activeDOMObject->getExecutionContext(), context());

+ DCHECK(activeDOMObject->suspendIfNeededCalled());

+#endif

activeDOMObject->stop();

}

@@ -104,7 +110,7 @@ unsigned ContextLifecycleNotifier::activeDOMObjectCount() const

return activeDOMObjects;

}

-#if ENABLE(ASSERT)

+#if DCHECK_IS_ON()

bool ContextLifecycleNotifier::contains(ActiveDOMObject* object) const

{

for (ContextLifecycleObserver* observer : m_observers) {