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

Unified Diff: third_party/WebKit/Source/core/editing/commands/InsertListCommand.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/InsertListCommand.cpp
diff --git a/third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp b/third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp
index 528d91b77dd4148119be4adb5eaa1305c09c98a5..0fadbdabc39121c569d3c26811b268d472bb5f61 100644
--- a/third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp
@@ -150,7 +150,7 @@ void InsertListCommand::doApply(EditingState* editingState)
if (endingSelection().isRange()) {
bool forceListCreation = false;
VisibleSelection selection = selectionForParagraphIteration(endingSelection());
- ASSERT(selection.isRange());
+ DCHECK(selection.isRange());
VisiblePosition startOfSelection = selection.visibleStart();
VisiblePosition endOfSelection = selection.visibleEnd();
VisiblePosition startOfLastParagraph = startOfParagraph(endOfSelection, CanSkipOverEditingBoundary);
@@ -190,7 +190,7 @@ void InsertListCommand::doApply(EditingState* editingState)
endOfSelection = visiblePositionForIndex(indexForEndOfSelection, scopeForEndOfSelection);
// If endOfSelection is null, then some contents have been deleted from the document.
// This should never happen and if it did, exit early immediately because we've lost the loop invariant.
- ASSERT(endOfSelection.isNotNull());
+ DCHECK(endOfSelection.isNotNull());
if (endOfSelection.isNull() || !rootEditableElementOf(endOfSelection))
return;
startOfLastParagraph = startOfParagraph(endOfSelection, CanSkipOverEditingBoundary);
@@ -218,7 +218,7 @@ void InsertListCommand::doApply(EditingState* editingState)
return;
}
- ASSERT(firstRangeOf(endingSelection()));
+ DCHECK(firstRangeOf(endingSelection()));
doApplyForSingleParagraph(false, listTag, *firstRangeOf(endingSelection()), editingState);
}
@@ -255,8 +255,8 @@ bool InsertListCommand::doApplyForSingleParagraph(bool forceCreateList, const HT
if (editingState->isAborted())
return false;
}
- ASSERT(listElement->hasEditableStyle());
- ASSERT(listElement->parentNode()->hasEditableStyle());
+ DCHECK(listElement->hasEditableStyle());
+ DCHECK(listElement->parentNode()->hasEditableStyle());
if (!listElement->hasTagName(listTag)) {
// |listChildNode| will be removed from the list and a list of type
// |m_type| will be created.
@@ -325,12 +325,12 @@ void InsertListCommand::unlistifyParagraph(const VisiblePosition& originalStart,
{
// Since, unlistify paragraph inserts nodes into parent and removes node
// from parent, if parent of |listElement| should be editable.
- ASSERT(listElement->parentNode()->hasEditableStyle());
+ DCHECK(listElement->parentNode()->hasEditableStyle());
Node* nextListChild;
Node* previousListChild;
VisiblePosition start;
VisiblePosition end;
- ASSERT(listChildNode);
+ DCHECK(listChildNode);
if (isHTMLLIElement(*listChildNode)) {
start = createVisiblePosition(firstPositionInNode(listChildNode));
end = createVisiblePosition(lastPositionInNode(listChildNode));
@@ -341,9 +341,9 @@ void InsertListCommand::unlistifyParagraph(const VisiblePosition& originalStart,
start = startOfParagraph(originalStart, CanSkipOverEditingBoundary);
end = endOfParagraph(start, CanSkipOverEditingBoundary);
nextListChild = enclosingListChild(nextPositionOf(end).deepEquivalent().anchorNode(), listElement);
- ASSERT(nextListChild != listChildNode);
+ DCHECK_NE(nextListChild, listChildNode);
previousListChild = enclosingListChild(previousPositionOf(start).deepEquivalent().anchorNode(), listElement);
- ASSERT(previousListChild != listChildNode);
+ DCHECK_NE(previousListChild, listChildNode);
}
// When removing a list, we must always create a placeholder to act as a point of insertion
// for the list content being removed.
@@ -485,7 +485,7 @@ void InsertListCommand::listifyParagraph(const VisiblePosition& originalStart, c
void InsertListCommand::moveParagraphOverPositionIntoEmptyListItem(const VisiblePosition& pos, HTMLLIElement* listItemElement, EditingState* editingState)
{
- ASSERT(!listItemElement->hasChildren());
+ DCHECK(!listItemElement->hasChildren());
HTMLBRElement* placeholder = HTMLBRElement::create(document());
appendNode(placeholder, listItemElement, editingState);
if (editingState->isAborted())

Powered by Google App Engine
This is Rietveld 408576698