Chromium Code Reviews| Index: third_party/WebKit/Source/core/editing/EditingUtilities.cpp |
| diff --git a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp |
| index b1969288e1236da78496692d17fcb110eb3ab03a..9b3555be414b6405f171263a0bc8faaf79a8fa33 100644 |
| --- a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp |
| +++ b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp |
| @@ -87,8 +87,8 @@ bool isAtomicNode(const Node *node) |
| template <typename Traversal> |
| static int comparePositions(Node* containerA, int offsetA, Node* containerB, int offsetB, bool* disconnected) |
| { |
| - ASSERT(containerA); |
| - ASSERT(containerB); |
| + DCHECK(containerA); |
| + DCHECK(containerB); |
| if (disconnected) |
| *disconnected = false; |
| @@ -193,21 +193,21 @@ int comparePositionsInFlatTree(Node* containerA, int offsetA, Node* containerB, |
| // could be inside a shadow tree. Only works for non-null values. |
| int comparePositions(const Position& a, const Position& b) |
| { |
| - ASSERT(a.isNotNull()); |
| - ASSERT(b.isNotNull()); |
| + DCHECK(a.isNotNull()); |
| + DCHECK(b.isNotNull()); |
| const TreeScope* commonScope = Position::commonAncestorTreeScope(a, b); |
| - ASSERT(commonScope); |
| + DCHECK(commonScope); |
| if (!commonScope) |
| return 0; |
| Node* nodeA = commonScope->ancestorInThisScope(a.computeContainerNode()); |
| - ASSERT(nodeA); |
| + DCHECK(nodeA); |
| bool hasDescendentA = nodeA != a.computeContainerNode(); |
| int offsetA = hasDescendentA ? 0 : a.computeOffsetInContainerNode(); |
| Node* nodeB = commonScope->ancestorInThisScope(b.computeContainerNode()); |
| - ASSERT(nodeB); |
| + DCHECK(nodeB); |
| bool hasDescendentB = nodeB != b.computeContainerNode(); |
| int offsetB = hasDescendentB ? 0 : b.computeOffsetInContainerNode(); |
| @@ -270,7 +270,7 @@ bool isEditablePosition(const Position& p, EditableType editableType, EUpdateSty |
| if (updateStyle == UpdateStyle) |
| node->document().updateLayoutIgnorePendingStylesheets(); |
| else |
| - ASSERT(updateStyle == DoNotUpdateStyle); |
| + DCHECK_EQ(updateStyle, DoNotUpdateStyle); |
| if (isDisplayInsideTable(node)) |
| node = node->parentNode(); |
| @@ -679,7 +679,7 @@ PositionInFlatTree previousPositionOf(const PositionInFlatTree& position, Positi |
| template <typename Strategy> |
| PositionTemplate<Strategy> nextPositionOfAlgorithm(const PositionTemplate<Strategy>& position, PositionMoveType moveType) |
| { |
| - ASSERT(moveType != PositionMoveType::BackwardDeletion); |
| + DCHECK(moveType != PositionMoveType::BackwardDeletion); |
|
yosin_UTC9
2016/04/14 04:35:00
Please add |TODO(yosin): We should have printer fo
|
| Node* node = position.anchorNode(); |
| if (!node) |
| @@ -843,7 +843,7 @@ String stringWithRebalancedWhitespace(const String& string, bool startIsStartOfP |
| } |
| } |
| - ASSERT(rebalancedString.length() == length); |
| + DCHECK_EQ(rebalancedString.length(), length); |
| return rebalancedString.toString(); |
| } |
| @@ -1023,8 +1023,8 @@ VisiblePosition visiblePositionBeforeNode(Node& node) |
| { |
| if (node.hasChildren()) |
| return createVisiblePosition(firstPositionInOrBeforeNode(&node)); |
| - ASSERT(node.parentNode()); |
| - ASSERT(!node.parentNode()->isShadowRoot()); |
| + DCHECK(node.parentNode()); |
|
yosin_UTC9
2016/04/14 04:35:00
How about adding |<< node|.
|
| + DCHECK(!node.parentNode()->isShadowRoot()); |
|
yosin_UTC9
2016/04/14 04:35:00
How about adding |<< node.parentNode()|.
|
| return createVisiblePosition(positionInParentBeforeNode(node)); |
| } |
| @@ -1033,8 +1033,8 @@ VisiblePosition visiblePositionAfterNode(Node& node) |
| { |
| if (node.hasChildren()) |
| return createVisiblePosition(lastPositionInOrAfterNode(&node)); |
| - ASSERT(node.parentNode()); |
| - ASSERT(!node.parentNode()->isShadowRoot()); |
| + DCHECK(node.parentNode()); |
|
yosin_UTC9
2016/04/14 04:35:00
How about adding |<< node|?
|
| + DCHECK(!node.parentNode()->isShadowRoot()); |
|
yosin_UTC9
2016/04/14 04:35:00
How about adding |<< node.parentNode()|?
|
| return createVisiblePosition(positionInParentAfterNode(node)); |
| } |
| @@ -1080,7 +1080,7 @@ template <typename Strategy> |
| static Node* enclosingNodeOfTypeAlgorithm(const PositionTemplate<Strategy>& p, bool (*nodeIsOfType)(const Node*), EditingBoundaryCrossingRule rule) |
| { |
| // TODO(yosin) support CanSkipCrossEditingBoundary |
| - ASSERT(rule == CanCrossEditingBoundary || rule == CannotCrossEditingBoundary); |
| + DCHECK(rule == CanCrossEditingBoundary || rule == CannotCrossEditingBoundary); |
|
yosin_UTC9
2016/04/14 04:35:00
How about adding |<< rule|?
|
| if (p.isNull()) |
| return nullptr; |
| @@ -1268,7 +1268,7 @@ bool isDisplayInsideTable(const Node* node) |
| bool isTableCell(const Node* node) |
| { |
| - ASSERT(node); |
| + DCHECK(node); |
| LayoutObject* r = node->layoutObject(); |
| return r ? r->isTableCell() : isHTMLTableCellElement(*node); |
| } |
| @@ -1412,7 +1412,7 @@ static Position previousCharacterPosition(const Position& position, TextAffinity |
| // This assumes that it starts in editable content. |
| Position leadingWhitespacePosition(const Position& position, TextAffinity affinity, WhitespacePositionOption option) |
| { |
| - ASSERT(isEditablePosition(position, ContentIsEditable, DoNotUpdateStyle)); |
| + DCHECK(isEditablePosition(position, ContentIsEditable, DoNotUpdateStyle)); |
|
yosin_UTC9
2016/04/14 04:35:00
How about adding |<< position|?
|
| if (position.isNull()) |
| return Position(); |
| @@ -1440,7 +1440,7 @@ Position leadingWhitespacePosition(const Position& position, TextAffinity affini |
| // This assumes that it starts in editable content. |
| Position trailingWhitespacePosition(const Position& position, TextAffinity, WhitespacePositionOption option) |
| { |
| - ASSERT(isEditablePosition(position, ContentIsEditable, DoNotUpdateStyle)); |
| + DCHECK(isEditablePosition(position, ContentIsEditable, DoNotUpdateStyle)); |
|
yosin_UTC9
2016/04/14 04:35:00
How about adding |<< position|?
|
| if (position.isNull()) |
| return Position(); |
| @@ -1597,7 +1597,7 @@ EphemeralRange makeRange(const VisiblePosition &start, const VisiblePosition &en |
| template <typename Strategy> |
| static EphemeralRangeTemplate<Strategy> normalizeRangeAlgorithm(const EphemeralRangeTemplate<Strategy>& range) |
| { |
| - ASSERT(range.isNotNull()); |
| + DCHECK(range.isNotNull()); |
| range.document().updateLayoutIgnorePendingStylesheets(); |
| // TODO(yosin) We should not call |parentAnchoredEquivalent()|, it is |