third_party/WebKit/Source/core/editing/commands/RemoveNodeCommand.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/RemoveNodeCommand.cpp

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

Patch Set: Rebase. 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/InsertTextCommand.cpp ('K') | « third_party/WebKit/Source/core/editing/commands/RemoveCSSPropertyCommand.cpp ('k') | third_party/WebKit/Source/core/editing/commands/RemoveNodePreservingChildrenCommand.cpp » ('j') | third_party/WebKit/Source/core/editing/commands/ReplaceNodeWithSpanCommand.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8e760513f0e982ba05c638531c404f13e917557e..f8ae11a3fb56724f0cc4831fdf101b5ac4cdaa04 100644

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

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

@@ -37,8 +37,8 @@ RemoveNodeCommand::RemoveNodeCommand(Node* node, ShouldAssumeContentIsAlwaysEdit

, m_node(node)

, m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable)

{

- ASSERT(m_node);

- ASSERT(m_node->parentNode());

+ DCHECK(m_node);

+ DCHECK(m_node->parentNode());

}

void RemoveNodeCommand::doApply(EditingState* editingState)

@@ -47,7 +47,7 @@ void RemoveNodeCommand::doApply(EditingState* editingState)

if (!parent || (m_shouldAssumeContentIsAlwaysEditable == DoNotAssumeContentIsAlwaysEditable

&& !parent->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable) && parent->inActiveDocument()))

return;

- ASSERT(parent->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable) || !parent->inActiveDocument());

+ DCHECK(parent->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable) || !parent->inActiveDocument());

yosin_UTC9 2016/04/14 04:35:03 How about adding |<< parent|?

m_parent = parent;

m_refChild = m_node->nextSibling();