Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Unified Diff: third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.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
Index: third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp
diff --git a/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp
index 994072e5211794084baa900b2410e6e686d0f010..1d459559258048a17e1a2283499ef6665ef2be05 100644
--- a/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp
@@ -83,8 +83,8 @@ void ApplyBlockElementCommand::doApply(EditingState* editingState)
VisibleSelection selection = selectionForParagraphIteration(endingSelection());
VisiblePosition startOfSelection = selection.visibleStart();
VisiblePosition endOfSelection = selection.visibleEnd();
- ASSERT(!startOfSelection.isNull());
- ASSERT(!endOfSelection.isNull());
+ DCHECK(!startOfSelection.isNull());
+ DCHECK(!endOfSelection.isNull());
ContainerNode* startScope = nullptr;
int startIndex = indexForVisiblePosition(startOfSelection, startScope);
ContainerNode* endScope = nullptr;
@@ -96,9 +96,9 @@ void ApplyBlockElementCommand::doApply(EditingState* editingState)
document().updateLayoutIgnorePendingStylesheets();
- ASSERT(startScope == endScope);
- ASSERT(startIndex >= 0);
- ASSERT(startIndex <= endIndex);
+ DCHECK_EQ(startScope, endScope);
+ DCHECK_GE(startIndex, 0);
+ DCHECK_LE(startIndex, endIndex);
if (startScope == endScope && startIndex >= 0 && startIndex <= endIndex) {
VisiblePosition start(visiblePositionForIndex(startIndex, startScope));
VisiblePosition end(visiblePositionForIndex(endIndex, endScope));
@@ -212,11 +212,11 @@ void ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded(const
splitTextNode(startText, startOffset);
start = firstPositionInNode(startText);
if (isStartAndEndOnSameNode) {
- ASSERT(end.offsetInContainerNode() >= startOffset);
+ DCHECK_GE(end.offsetInContainerNode(), startOffset);
end = Position(startText, end.offsetInContainerNode() - startOffset);
}
if (isStartAndEndOfLastParagraphOnSameNode) {
- ASSERT(m_endOfLastParagraph.offsetInContainerNode() >= startOffset);
+ DCHECK_GE(m_endOfLastParagraph.offsetInContainerNode(), startOffset);
m_endOfLastParagraph = Position(startText, m_endOfLastParagraph.offsetInContainerNode() - startOffset);
}
}
@@ -272,11 +272,11 @@ VisiblePosition ApplyBlockElementCommand::endOfNextParagrahSplittingTextNodesIfN
splitTextNode(text, 1);
if (text == start.computeContainerNode() && text->previousSibling() && text->previousSibling()->isTextNode()) {
- ASSERT(start.offsetInContainerNode() < position.offsetInContainerNode());
+ DCHECK_LT(start.offsetInContainerNode(), position.offsetInContainerNode());
start = Position(toText(text->previousSibling()), start.offsetInContainerNode());
}
if (text == end.computeContainerNode() && text->previousSibling() && text->previousSibling()->isTextNode()) {
- ASSERT(end.offsetInContainerNode() < position.offsetInContainerNode());
+ DCHECK_LT(end.offsetInContainerNode(), position.offsetInContainerNode());
end = Position(toText(text->previousSibling()), end.offsetInContainerNode());
}
if (text == m_endOfLastParagraph.computeContainerNode()) {

Powered by Google App Engine
This is Rietveld 408576698