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

Unified Diff: Source/core/dom/Position.cpp

Issue 189773005: Revert of Have Position deal with more references (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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
« no previous file with comments | « Source/core/dom/Position.h ('k') | Source/core/dom/PositionIterator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Position.cpp
diff --git a/Source/core/dom/Position.cpp b/Source/core/dom/Position.cpp
index 6978144b7a3fed9897ee94a82e283c24dcca78d2..c08a67c3559579812606ec813f61a4ce43794ea4 100644
--- a/Source/core/dom/Position.cpp
+++ b/Source/core/dom/Position.cpp
@@ -181,7 +181,7 @@
case PositionIsBeforeChildren:
return 0;
case PositionIsAfterChildren:
- return lastOffsetInNode(*m_anchorNode);
+ return lastOffsetInNode(m_anchorNode.get());
case PositionIsOffsetInAnchor:
return minOffsetForNode(m_anchorNode.get(), m_offset);
case PositionIsBeforeAnchor:
@@ -315,9 +315,9 @@
case CodePoint:
return createLegacyEditingPosition(node, offset - 1);
case Character:
- return createLegacyEditingPosition(node, uncheckedPreviousOffset(*node, offset));
+ return createLegacyEditingPosition(node, uncheckedPreviousOffset(node, offset));
case BackwardDeletion:
- return createLegacyEditingPosition(node, uncheckedPreviousOffsetForBackwardDeletion(*node, offset));
+ return createLegacyEditingPosition(node, uncheckedPreviousOffsetForBackwardDeletion(node, offset));
}
}
@@ -347,7 +347,7 @@
// Going forward one character at a time is correct.
// 2) The new offset is a bogus offset like (<br>, 1), and there is no child.
// Going from 0 to 1 is correct.
- return createLegacyEditingPosition(node, (moveType == Character) ? uncheckedNextOffset(*node, offset) : offset + 1);
+ return createLegacyEditingPosition(node, (moveType == Character) ? uncheckedNextOffset(node, offset) : offset + 1);
}
if (ContainerNode* parent = node->parentNode())
@@ -355,19 +355,19 @@
return *this;
}
-int Position::uncheckedPreviousOffset(const Node& n, int current)
-{
- return n.renderer() ? n.renderer()->previousOffset(current) : current - 1;
-}
-
-int Position::uncheckedPreviousOffsetForBackwardDeletion(const Node& n, int current)
-{
- return n.renderer() ? n.renderer()->previousOffsetForBackwardDeletion(current) : current - 1;
-}
-
-int Position::uncheckedNextOffset(const Node& n, int current)
-{
- return n.renderer() ? n.renderer()->nextOffset(current) : current + 1;
+int Position::uncheckedPreviousOffset(const Node* n, int current)
+{
+ return n->renderer() ? n->renderer()->previousOffset(current) : current - 1;
+}
+
+int Position::uncheckedPreviousOffsetForBackwardDeletion(const Node* n, int current)
+{
+ return n->renderer() ? n->renderer()->previousOffsetForBackwardDeletion(current) : current - 1;
+}
+
+int Position::uncheckedNextOffset(const Node* n, int current)
+{
+ return n->renderer() ? n->renderer()->nextOffset(current) : current + 1;
}
bool Position::atFirstEditingPositionForNode() const
@@ -640,7 +640,7 @@
// Return position after tables and nodes which have content that can be ignored.
if (editingIgnoresContent(currentNode) || isRenderedTableElement(currentNode)) {
if (currentPos.atEndOfNode())
- return positionAfterNode(*currentNode);
+ return positionAfterNode(currentNode);
continue;
}
« no previous file with comments | « Source/core/dom/Position.h ('k') | Source/core/dom/PositionIterator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698