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

Unified Diff: Source/core/editing/VisibleUnits.cpp

Issue 188033005: 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/editing/VisibleSelection.cpp ('k') | Source/core/editing/htmlediting.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/VisibleUnits.cpp
diff --git a/Source/core/editing/VisibleUnits.cpp b/Source/core/editing/VisibleUnits.cpp
index 723a7c3e4acdb54e0924fd81f80c9d1b2d148f7e..36abf177e757e5c6571e539797ceac0b27a224ba 100644
--- a/Source/core/editing/VisibleUnits.cpp
+++ b/Source/core/editing/VisibleUnits.cpp
@@ -89,7 +89,7 @@ static Position previousRootInlineBoxCandidatePosition(Node* node, const Visible
if (highestEditableRoot(firstPositionInOrBeforeNode(previousNode), editableType) != highestRoot)
break;
- Position pos = previousNode->hasTagName(brTag) ? positionBeforeNode(previousNode) :
+ Position pos = previousNode->hasTagName(brTag) ? positionBeforeNode(*previousNode) :
createLegacyEditingPosition(previousNode, caretMaxOffset(previousNode));
if (pos.isCandidate())
@@ -745,7 +745,7 @@ static VisiblePosition startPositionForLine(const VisiblePosition& c, LineEndpoi
}
}
- return VisiblePosition(startNode->isTextNode() ? Position(toText(startNode), toInlineTextBox(startBox)->start()) : positionBeforeNode(startNode));
+ return VisiblePosition(startNode->isTextNode() ? Position(toText(startNode), toInlineTextBox(startBox)->start()) : positionBeforeNode(*startNode));
}
static VisiblePosition startOfLine(const VisiblePosition& c, LineEndpointComputationMode mode)
@@ -814,7 +814,7 @@ static VisiblePosition endPositionForLine(const VisiblePosition& c, LineEndpoint
Position pos;
if (endNode->hasTagName(brTag))
- pos = positionBeforeNode(endNode);
+ pos = positionBeforeNode(*endNode);
else if (endBox->isInlineTextBox() && endNode->isTextNode()) {
InlineTextBox* endTextBox = toInlineTextBox(endBox);
int endOffset = endTextBox->start();
@@ -822,7 +822,7 @@ static VisiblePosition endPositionForLine(const VisiblePosition& c, LineEndpoint
endOffset += endTextBox->len();
pos = Position(toText(endNode), endOffset);
} else
- pos = positionAfterNode(endNode);
+ pos = positionAfterNode(*endNode);
return VisiblePosition(pos, VP_UPSTREAM_IF_POSSIBLE);
}
@@ -1086,7 +1086,7 @@ VisiblePosition startOfParagraph(const VisiblePosition& c, EditingBoundaryCrossi
return VisiblePosition();
if (isRenderedAsNonInlineTableImageOrHR(startNode))
- return VisiblePosition(positionBeforeNode(startNode));
+ return VisiblePosition(positionBeforeNode(*startNode));
Node* startBlock = enclosingBlock(startNode);
@@ -1163,7 +1163,7 @@ VisiblePosition endOfParagraph(const VisiblePosition &c, EditingBoundaryCrossing
Node* startNode = p.deprecatedNode();
if (isRenderedAsNonInlineTableImageOrHR(startNode))
- return VisiblePosition(positionAfterNode(startNode));
+ return VisiblePosition(positionAfterNode(*startNode));
Node* startBlock = enclosingBlock(startNode);
Node* stayInsideBlock = startBlock;
« no previous file with comments | « Source/core/editing/VisibleSelection.cpp ('k') | Source/core/editing/htmlediting.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698