third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp - Issue 1878473002: ASSERT -> DCHECK in core/editing.

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/editing/commands/MergeIdenticalElementsCommand.cpp

Issue 1878473002: ASSERT -> DCHECK in core/editing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Output info for some DCHECKs, add TODOs. 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

« third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp ('K') | « third_party/WebKit/Source/core/editing/commands/InsertTextCommand.cpp ('k') | third_party/WebKit/Source/core/editing/commands/MoveSelectionCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp

diff --git a/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp b/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp

index 0650534eccc4c52f0ffc95c0ed8016dfe0541445..809f89acb03ef616b6f5845faf40539840c152c9 100644

--- a/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp

+++ b/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp

@@ -36,9 +36,9 @@ MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(Element* first, Ele

, m_element1(first)

, m_element2(second)

{

- ASSERT(m_element1);

- ASSERT(m_element2);

- ASSERT(m_element1->nextSibling() == m_element2);

+ DCHECK(m_element1);

+ DCHECK(m_element2);

+ DCHECK_EQ(m_element1->nextSibling(), m_element2);

}

void MergeIdenticalElementsCommand::doApply(EditingState*)

@@ -59,8 +59,8 @@ void MergeIdenticalElementsCommand::doApply(EditingState*)

void MergeIdenticalElementsCommand::doUnapply()

{

- ASSERT(m_element1);

- ASSERT(m_element2);

+ DCHECK(m_element1);

+ DCHECK(m_element2);

Node* atChild = m_atChild.release();