third_party/WebKit/Source/core/dom/shadow/InsertionPoint.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/shadow/InsertionPoint.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/shadow/FlatTreeTraversalTest.cpp ('k') | third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp

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

index 9ea38c099f3a88ca66893387750f30c15c33593c..a7ae42f91ffd3b88bdbbad787aa5adae2cc87489 100644

--- a/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp

+++ b/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp

@@ -145,7 +145,7 @@ bool InsertionPoint::isActive() const

if (!canBeActive())

return false;

ShadowRoot* shadowRoot = containingShadowRoot();

- ASSERT(shadowRoot);

+ DCHECK(shadowRoot);

if (!isHTMLShadowElement(*this) || shadowRoot->descendantShadowElementCount() <= 1)

return true;

@@ -235,7 +235,7 @@ void InsertionPoint::removedFrom(ContainerNode* insertionPoint)

clearDistribution();

if (m_registeredWithShadowRoot && insertionPoint->treeScope().rootNode() == root) {

- ASSERT(root);

+ DCHECK(root);

m_registeredWithShadowRoot = false;

root->didRemoveInsertionPoint(this);

if (rootOwner) {

@@ -255,7 +255,7 @@ DEFINE_TRACE(InsertionPoint)

const InsertionPoint* resolveReprojection(const Node* projectedNode)

{

- ASSERT(projectedNode);

+ DCHECK(projectedNode);

const InsertionPoint* insertionPoint = 0;

const Node* current = projectedNode;

ElementShadow* lastElementShadow = 0;

@@ -267,7 +267,7 @@ const InsertionPoint* resolveReprojection(const Node* projectedNode)

const InsertionPoint* insertedTo = shadow->finalDestinationInsertionPointFor(projectedNode);

if (!insertedTo)

break;

- ASSERT(current != insertedTo);

+ DCHECK_NE(current, insertedTo);

current = insertedTo;

insertionPoint = insertedTo;

}

@@ -288,7 +288,7 @@ void collectDestinationInsertionPoints(const Node& node, HeapVector<Member<Inser

return;

for (size_t i = 0; i < insertionPoints->size(); ++i)

results.append(insertionPoints->at(i).get());

- ASSERT(current != insertionPoints->last().get());

+ DCHECK_NE(current, insertionPoints->last().get());

current = insertionPoints->last().get();

}