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

Unified Diff: third_party/WebKit/Source/core/editing/commands/InsertTextCommand.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/InsertParagraphSeparatorCommand.cpp ('K') | « third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp ('k') | third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp » ('j') | third_party/WebKit/Source/core/editing/commands/RemoveNodeCommand.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 513f006b6809f3f3c401a69d864671cc1e98ff4e..f6da94821eeb6f812031368a9e20ccc679641fb1 100644

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

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

@@ -126,7 +126,7 @@ bool InsertTextCommand::performOverwrite(const String& text, bool selectInserted

void InsertTextCommand::doApply(EditingState* editingState)

{

- ASSERT(m_text.find('\n') == kNotFound);

+ DCHECK_EQ(m_text.find('\n'), kNotFound);

if (!endingSelection().isNonOrphanedCaretOrRange())

return;

@@ -177,7 +177,7 @@ void InsertTextCommand::doApply(EditingState* editingState)

// It is possible for the node that contains startPosition to contain only unrendered whitespace,

// and so deleteInsignificantText could remove it. Save the position before the node in case that happens.

- ASSERT(startPosition.computeContainerNode());

+ DCHECK(startPosition.computeContainerNode());

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

Position positionBeforeStartNode(positionInParentBeforeNode(*startPosition.computeContainerNode()));

deleteInsignificantText(startPosition, mostForwardCaretPosition(startPosition));

if (!startPosition.inShadowIncludingDocument())

@@ -203,9 +203,9 @@ void InsertTextCommand::doApply(EditingState* editingState)

startPosition = positionInsideTextNode(startPosition, editingState);

if (editingState->isAborted())

return;

- ASSERT(startPosition.isOffsetInAnchor());

- ASSERT(startPosition.computeContainerNode());

- ASSERT(startPosition.computeContainerNode()->isTextNode());

+ DCHECK(startPosition.isOffsetInAnchor());

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

+ DCHECK(startPosition.computeContainerNode());

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

+ DCHECK(startPosition.computeContainerNode()->isTextNode());

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

if (placeholder.isNotNull())

removePlaceholderAt(placeholder);

Text* textNode = toText(startPosition.computeContainerNode());

@@ -221,7 +221,7 @@ void InsertTextCommand::doApply(EditingState* editingState)

if (!shouldRebalanceLeadingWhitespaceFor(m_text))

rebalanceWhitespaceAt(startPosition);

} else {

- ASSERT(m_rebalanceType == RebalanceAllWhitespaces);

+ DCHECK_EQ(m_rebalanceType, RebalanceAllWhitespaces);

if (canRebalance(startPosition) && canRebalance(endPosition))

rebalanceWhitespaceOnTextSubstring(textNode, startPosition.offsetInContainerNode(), endPosition.offsetInContainerNode());

}