third_party/WebKit/Source/core/editing/commands/InsertNodeBeforeCommand.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/InsertNodeBeforeCommand.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/EditCommand.cpp ('K') | « third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp ('k') | third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp » ('j') | third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 387068871a46f54c534c638dc2880a34a67f3fd1..86502b890da0e7142b9a5b5c5e45686d30336d39 100644

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

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

@@ -36,12 +36,12 @@ InsertNodeBeforeCommand::InsertNodeBeforeCommand(Node* insertChild, Node* refChi

, m_refChild(refChild)

, m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable)

{

- ASSERT(m_insertChild);

- ASSERT(!m_insertChild->parentNode());

- ASSERT(m_refChild);

- ASSERT(m_refChild->parentNode());

+ DCHECK(m_insertChild);

+ DCHECK(!m_insertChild->parentNode());

yosin_UTC9 2016/04/14 04:35:02 How about adding |<< m_insertChild|?

+ DCHECK(m_refChild);

+ DCHECK(m_refChild->parentNode());

yosin_UTC9 2016/04/14 04:35:02 How about adding |<< m_refChild|?

- ASSERT(m_refChild->parentNode()->hasEditableStyle() || !m_refChild->parentNode()->inActiveDocument());

+ DCHECK(m_refChild->parentNode()->hasEditableStyle() || !m_refChild->parentNode()->inActiveDocument());

yosin_UTC9 2016/04/14 04:35:02 How about adding |<< m_refChild->parentNode()|?

}

void InsertNodeBeforeCommand::doApply(EditingState*)

@@ -49,7 +49,7 @@ void InsertNodeBeforeCommand::doApply(EditingState*)

ContainerNode* parent = m_refChild->parentNode();

if (!parent || (m_shouldAssumeContentIsAlwaysEditable == DoNotAssumeContentIsAlwaysEditable && !parent->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable)))

return;

- ASSERT(parent->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable));

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

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

parent->insertBefore(m_insertChild.get(), m_refChild.get(), IGNORE_EXCEPTION);

}