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

Unified Diff: third_party/WebKit/Source/core/editing/Position.cpp

Issue 2958523002: Make Position::LastOffsetInNode() to take const Node& (Closed)
Patch Set: 2017-06-23T18:50:42 Created 3 years, 6 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/Position.cpp
diff --git a/third_party/WebKit/Source/core/editing/Position.cpp b/third_party/WebKit/Source/core/editing/Position.cpp
index 964782671710f69e392a15a16806a1f7785f728d..bb52336e1a4fce1d217022f30dda249de800dfb2 100644
--- a/third_party/WebKit/Source/core/editing/Position.cpp
+++ b/third_party/WebKit/Source/core/editing/Position.cpp
@@ -188,7 +188,7 @@ int PositionTemplate<Strategy>::ComputeOffsetInContainerNode() const {
case PositionAnchorType::kBeforeChildren:
return 0;
case PositionAnchorType::kAfterChildren:
- return LastOffsetInNode(anchor_node_.Get());
+ return LastOffsetInNode(*anchor_node_);
case PositionAnchorType::kOffsetInAnchor:
return MinOffsetForNode<Strategy>(anchor_node_.Get(), offset_);
case PositionAnchorType::kBeforeAnchor:
@@ -481,10 +481,10 @@ PositionTemplate<Strategy> PositionTemplate<Strategy>::AfterNode(
// static
template <typename Strategy>
-int PositionTemplate<Strategy>::LastOffsetInNode(Node* node) {
- return node->IsCharacterDataNode()
- ? node->MaxCharacterOffset()
- : static_cast<int>(Strategy::CountChildren(*node));
+int PositionTemplate<Strategy>::LastOffsetInNode(const Node& node) {
+ return node.IsCharacterDataNode()
+ ? node.MaxCharacterOffset()
+ : static_cast<int>(Strategy::CountChildren(node));
}
// static
@@ -501,9 +501,10 @@ PositionTemplate<Strategy> PositionTemplate<Strategy>::FirstPositionInNode(
template <typename Strategy>
PositionTemplate<Strategy> PositionTemplate<Strategy>::LastPositionInNode(
Node* anchor_node) {
- if (anchor_node->IsTextNode())
+ if (anchor_node->IsTextNode()) {
return PositionTemplate<Strategy>(anchor_node,
- LastOffsetInNode(anchor_node));
+ LastOffsetInNode(*anchor_node));
+ }
return PositionTemplate<Strategy>(anchor_node,
PositionAnchorType::kAfterChildren);
}

Powered by Google App Engine
This is Rietveld 408576698