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

Unified Diff: third_party/WebKit/Source/core/dom/shadow/ShadowRoot.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
Index: third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp
diff --git a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp
index 0edd044000c2709e459d5a583577f97e7d436f69..158916e9eb3502e3c5b049fe66ba122e426ba031 100644
--- a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp
+++ b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp
@@ -69,8 +69,8 @@ ShadowRoot::ShadowRoot(Document& document, ShadowRootType type)
ShadowRoot::~ShadowRoot()
{
#if !ENABLE(OILPAN)
- ASSERT(!m_prev);
- ASSERT(!m_next);
+ DCHECK(!m_prev);
+ DCHECK(!m_next);
if (m_shadowRootRareData && m_shadowRootRareData->styleSheets())
m_shadowRootRareData->styleSheets()->detachFromDocument();
@@ -107,7 +107,7 @@ ShadowRoot* ShadowRoot::olderShadowRootForBindings() const
ShadowRoot* older = olderShadowRoot();
while (older && !older->isOpenOrV0())
older = older->olderShadowRoot();
- ASSERT(!older || older->isOpenOrV0());
+ DCHECK(!older || older->isOpenOrV0());
return older;
}
@@ -136,7 +136,7 @@ void ShadowRoot::setInnerHTML(const String& markup, ExceptionState& exceptionSta
void ShadowRoot::recalcStyle(StyleRecalcChange change)
{
// ShadowRoot doesn't support custom callbacks.
- ASSERT(!hasCustomStyleCallbacks());
+ DCHECK(!hasCustomStyleCallbacks());
StyleSharingDepthScope sharingScope(*this);
@@ -164,7 +164,7 @@ Node::InsertionNotificationRequest ShadowRoot::insertedInto(ContainerNode* inser
return InsertionDone;
// FIXME: When parsing <video controls>, insertedInto() is called many times without invoking removedFrom.
- // For now, we check m_registeredWithParentShadowroot. We would like to ASSERT(!m_registeredShadowRoot) here.
+ // For now, we check m_registeredWithParentShadowroot. We would like to DCHECK(!m_registeredShadowRoot) here.
// https://bugs.webkit.org/show_bug.cig?id=101316
if (m_registeredWithParentShadowRoot)
return InsertionDone;
@@ -214,7 +214,7 @@ void ShadowRoot::registerScopedHTMLStyleChild()
void ShadowRoot::unregisterScopedHTMLStyleChild()
{
- ASSERT(m_numberOfStyles > 0);
+ DCHECK_GT(m_numberOfStyles, 0u);
--m_numberOfStyles;
}
@@ -331,7 +331,7 @@ void ShadowRoot::didAddSlot()
void ShadowRoot::didRemoveSlot()
{
- ASSERT(m_shadowRootRareData);
+ DCHECK(m_shadowRootRareData);
m_shadowRootRareData->didRemoveSlot();
invalidateDescendantSlots();
}
@@ -351,13 +351,13 @@ const HeapVector<Member<HTMLSlotElement>>& ShadowRoot::descendantSlots()
{
DEFINE_STATIC_LOCAL(HeapVector<Member<HTMLSlotElement>>, emptyList, (new HeapVector<Member<HTMLSlotElement>>));
if (m_descendantSlotsIsValid) {
- ASSERT(m_shadowRootRareData);
+ DCHECK(m_shadowRootRareData);
return m_shadowRootRareData->descendantSlots();
}
if (descendantSlotCount() == 0)
return emptyList;
- ASSERT(m_shadowRootRareData);
+ DCHECK(m_shadowRootRareData);
HeapVector<Member<HTMLSlotElement>> slots;
slots.reserveCapacity(descendantSlotCount());
for (HTMLSlotElement& slot : Traversal<HTMLSlotElement>::descendantsOf(rootNode()))

Powered by Google App Engine
This is Rietveld 408576698