Commit 267536e0 authored by Andrey Kraynov's avatar Andrey Kraynov Committed by Commit Bot

Change call sites in EditingUtilities.cpp to use |const Node&|

Do not use deprecated functions with |Node*| where possible in
EditingUtilities.cpp code.
Node pointers at all places must not be null due to explcit checks.

No changes in behavior.

Bug: 766448
Change-Id: I4da3e1d95d5bc322c21dfadd53b9542884531dc3
Reviewed-on: https://chromium-review.googlesource.com/696083
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Reviewed-by: default avatarYoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505910}
parent b3850648
...@@ -741,9 +741,8 @@ PositionTemplate<Strategy> LastEditablePositionBeforePositionInRootAlgorithm( ...@@ -741,9 +741,8 @@ PositionTemplate<Strategy> LastEditablePositionBeforePositionInRootAlgorithm(
if (!shadow_ancestor) if (!shadow_ancestor)
return PositionTemplate<Strategy>(); return PositionTemplate<Strategy>();
editable_position = editable_position = PositionTemplate<Strategy>::FirstPositionInOrBeforeNode(
PositionTemplate<Strategy>::FirstPositionInOrBeforeNodeDeprecated( *shadow_ancestor);
shadow_ancestor);
} }
while (editable_position.AnchorNode() && while (editable_position.AnchorNode() &&
...@@ -851,8 +850,7 @@ PositionTemplate<Strategy> PreviousPositionOfAlgorithm( ...@@ -851,8 +850,7 @@ PositionTemplate<Strategy> PreviousPositionOfAlgorithm(
if (EditingIgnoresContent(*node)) if (EditingIgnoresContent(*node))
return PositionTemplate<Strategy>::BeforeNode(*node); return PositionTemplate<Strategy>::BeforeNode(*node);
if (Node* child = Strategy::ChildAt(*node, offset - 1)) { if (Node* child = Strategy::ChildAt(*node, offset - 1)) {
return PositionTemplate<Strategy>::LastPositionInOrAfterNodeDeprecated( return PositionTemplate<Strategy>::LastPositionInOrAfterNode(*child);
child);
} }
// There are two reasons child might be 0: // There are two reasons child might be 0:
...@@ -910,8 +908,7 @@ PositionTemplate<Strategy> NextPositionOfAlgorithm( ...@@ -910,8 +908,7 @@ PositionTemplate<Strategy> NextPositionOfAlgorithm(
const int offset = position.ComputeEditingOffset(); const int offset = position.ComputeEditingOffset();
if (Node* child = Strategy::ChildAt(*node, offset)) { if (Node* child = Strategy::ChildAt(*node, offset)) {
return PositionTemplate<Strategy>::FirstPositionInOrBeforeNodeDeprecated( return PositionTemplate<Strategy>::FirstPositionInOrBeforeNode(*child);
child);
} }
// TODO(yosin) We should use |Strategy::lastOffsetForEditing()| instead of // TODO(yosin) We should use |Strategy::lastOffsetForEditing()| instead of
...@@ -1226,7 +1223,7 @@ Element* TableElementJustAfter(const VisiblePosition& visible_position) { ...@@ -1226,7 +1223,7 @@ Element* TableElementJustAfter(const VisiblePosition& visible_position) {
VisiblePosition VisiblePositionBeforeNode(Node& node) { VisiblePosition VisiblePositionBeforeNode(Node& node) {
DCHECK(!NeedsLayoutTreeUpdate(node)); DCHECK(!NeedsLayoutTreeUpdate(node));
if (node.hasChildren()) if (node.hasChildren())
return CreateVisiblePosition(FirstPositionInOrBeforeNodeDeprecated(&node)); return CreateVisiblePosition(FirstPositionInOrBeforeNode(node));
DCHECK(node.parentNode()) << node; DCHECK(node.parentNode()) << node;
DCHECK(!node.parentNode()->IsShadowRoot()) << node.parentNode(); DCHECK(!node.parentNode()->IsShadowRoot()) << node.parentNode();
return VisiblePosition::InParentBeforeNode(node); return VisiblePosition::InParentBeforeNode(node);
...@@ -1236,7 +1233,7 @@ VisiblePosition VisiblePositionBeforeNode(Node& node) { ...@@ -1236,7 +1233,7 @@ VisiblePosition VisiblePositionBeforeNode(Node& node) {
VisiblePosition VisiblePositionAfterNode(Node& node) { VisiblePosition VisiblePositionAfterNode(Node& node) {
DCHECK(!NeedsLayoutTreeUpdate(node)); DCHECK(!NeedsLayoutTreeUpdate(node));
if (node.hasChildren()) if (node.hasChildren())
return CreateVisiblePosition(LastPositionInOrAfterNodeDeprecated(&node)); return CreateVisiblePosition(LastPositionInOrAfterNode(node));
DCHECK(node.parentNode()) << node.parentNode(); DCHECK(node.parentNode()) << node.parentNode();
DCHECK(!node.parentNode()->IsShadowRoot()) << node.parentNode(); DCHECK(!node.parentNode()->IsShadowRoot()) << node.parentNode();
return VisiblePosition::InParentAfterNode(node); return VisiblePosition::InParentAfterNode(node);
...@@ -1402,8 +1399,7 @@ HTMLElement* EnclosingList(Node* node) { ...@@ -1402,8 +1399,7 @@ HTMLElement* EnclosingList(Node* node) {
if (!node) if (!node)
return 0; return 0;
ContainerNode* root = ContainerNode* root = HighestEditableRoot(FirstPositionInOrBeforeNode(*node));
HighestEditableRoot(FirstPositionInOrBeforeNodeDeprecated(node));
for (Node& runner : NodeTraversal::AncestorsOf(*node)) { for (Node& runner : NodeTraversal::AncestorsOf(*node)) {
if (IsHTMLUListElement(runner) || IsHTMLOListElement(runner)) if (IsHTMLUListElement(runner) || IsHTMLOListElement(runner))
...@@ -1421,8 +1417,7 @@ Node* EnclosingListChild(Node* node) { ...@@ -1421,8 +1417,7 @@ Node* EnclosingListChild(Node* node) {
// Check for a list item element, or for a node whose parent is a list // Check for a list item element, or for a node whose parent is a list
// element. Such a node will appear visually as a list item (but without a // element. Such a node will appear visually as a list item (but without a
// list marker) // list marker)
ContainerNode* root = ContainerNode* root = HighestEditableRoot(FirstPositionInOrBeforeNode(*node));
HighestEditableRoot(FirstPositionInOrBeforeNodeDeprecated(node));
// FIXME: This function is inappropriately named if it starts with node // FIXME: This function is inappropriately named if it starts with node
// instead of node->parentNode() // instead of node->parentNode()
...@@ -1449,10 +1444,10 @@ Node* EnclosingEmptyListItem(const VisiblePosition& visible_pos) { ...@@ -1449,10 +1444,10 @@ Node* EnclosingEmptyListItem(const VisiblePosition& visible_pos) {
!IsEndOfParagraph(visible_pos)) !IsEndOfParagraph(visible_pos))
return 0; return 0;
VisiblePosition first_in_list_child = CreateVisiblePosition( VisiblePosition first_in_list_child =
FirstPositionInOrBeforeNodeDeprecated(list_child_node)); CreateVisiblePosition(FirstPositionInOrBeforeNode(*list_child_node));
VisiblePosition last_in_list_child = CreateVisiblePosition( VisiblePosition last_in_list_child =
LastPositionInOrAfterNodeDeprecated(list_child_node)); CreateVisiblePosition(LastPositionInOrAfterNode(*list_child_node));
if (first_in_list_child.DeepEquivalent() != visible_pos.DeepEquivalent() || if (first_in_list_child.DeepEquivalent() != visible_pos.DeepEquivalent() ||
last_in_list_child.DeepEquivalent() != visible_pos.DeepEquivalent()) last_in_list_child.DeepEquivalent() != visible_pos.DeepEquivalent())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment