Commit c30b432d authored by yosin@chromium.org's avatar yosin@chromium.org

Rename {first,last}EditablePosition{After,Before}PositionInRoot to denote them...

Rename {first,last}EditablePosition{After,Before}PositionInRoot to denote them returned VisiblePosion

This patch renames {first,last}EditablePosition{After,Before}PositionInRoot to
{first,last}EditableVisiblePosition{After,Before}PositionInRoot for having
lastEditblePositionBeforePositionInRoot() which returns Position instead of
VisiblePosition.

This patch is a preparation of fixing issue 339187 by
http://crrev.com/340713003

BUG=n/a
TEST=n/a

Review URL: https://codereview.chromium.org/340013002

git-svn-id: svn://svn.chromium.org/blink/trunk@176475 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a83715bf
...@@ -166,7 +166,7 @@ void DeleteSelectionCommand::initializePositionData() ...@@ -166,7 +166,7 @@ void DeleteSelectionCommand::initializePositionData()
ASSERT(isEditablePosition(start, ContentIsEditable, DoNotUpdateStyle)); ASSERT(isEditablePosition(start, ContentIsEditable, DoNotUpdateStyle));
if (!isEditablePosition(end, ContentIsEditable, DoNotUpdateStyle)) if (!isEditablePosition(end, ContentIsEditable, DoNotUpdateStyle))
end = lastEditablePositionBeforePositionInRoot(end, highestEditableRoot(start)).deepEquivalent(); end = lastEditableVisiblePositionBeforePositionInRoot(end, highestEditableRoot(start)).deepEquivalent();
m_upstreamStart = start.upstream(); m_upstreamStart = start.upstream();
m_downstreamStart = start.downstream(); m_downstreamStart = start.downstream();
......
...@@ -180,7 +180,7 @@ void SpellChecker::advanceToNextMisspelling(bool startBeforeSelection) ...@@ -180,7 +180,7 @@ void SpellChecker::advanceToNextMisspelling(bool startBeforeSelection)
// when spell checking the whole document before sending the message. // when spell checking the whole document before sending the message.
// In that case the document might not be editable, but there are editable pockets that need to be spell checked. // In that case the document might not be editable, but there are editable pockets that need to be spell checked.
position = firstEditablePositionAfterPositionInRoot(position, m_frame.document()->documentElement()).deepEquivalent(); position = firstEditableVisiblePositionAfterPositionInRoot(position, m_frame.document()->documentElement()).deepEquivalent();
if (position.isNull()) if (position.isNull())
return; return;
......
...@@ -475,7 +475,7 @@ VisiblePosition VisiblePosition::honorEditingBoundaryAtOrBefore(const VisiblePos ...@@ -475,7 +475,7 @@ VisiblePosition VisiblePosition::honorEditingBoundaryAtOrBefore(const VisiblePos
return VisiblePosition(); return VisiblePosition();
// Return the last position before pos that is in the same editable region as this position // Return the last position before pos that is in the same editable region as this position
return lastEditablePositionBeforePositionInRoot(pos.deepEquivalent(), highestRoot); return lastEditableVisiblePositionBeforePositionInRoot(pos.deepEquivalent(), highestRoot);
} }
VisiblePosition VisiblePosition::honorEditingBoundaryAtOrAfter(const VisiblePosition &pos) const VisiblePosition VisiblePosition::honorEditingBoundaryAtOrAfter(const VisiblePosition &pos) const
...@@ -501,7 +501,7 @@ VisiblePosition VisiblePosition::honorEditingBoundaryAtOrAfter(const VisiblePosi ...@@ -501,7 +501,7 @@ VisiblePosition VisiblePosition::honorEditingBoundaryAtOrAfter(const VisiblePosi
return VisiblePosition(); return VisiblePosition();
// Return the next position after pos that is in the same editable region as this position // Return the next position after pos that is in the same editable region as this position
return firstEditablePositionAfterPositionInRoot(pos.deepEquivalent(), highestRoot); return firstEditableVisiblePositionAfterPositionInRoot(pos.deepEquivalent(), highestRoot);
} }
VisiblePosition VisiblePosition::skipToStartOfEditingBoundary(const VisiblePosition &pos) const VisiblePosition VisiblePosition::skipToStartOfEditingBoundary(const VisiblePosition &pos) const
...@@ -521,7 +521,7 @@ VisiblePosition VisiblePosition::skipToStartOfEditingBoundary(const VisiblePosit ...@@ -521,7 +521,7 @@ VisiblePosition VisiblePosition::skipToStartOfEditingBoundary(const VisiblePosit
return VisiblePosition(previousVisuallyDistinctCandidate(Position(highestRootOfPos, Position::PositionIsBeforeAnchor).parentAnchoredEquivalent())); return VisiblePosition(previousVisuallyDistinctCandidate(Position(highestRootOfPos, Position::PositionIsBeforeAnchor).parentAnchoredEquivalent()));
// That must mean that |pos| is not editable. Return the last position before pos that is in the same editable region as this position // That must mean that |pos| is not editable. Return the last position before pos that is in the same editable region as this position
return lastEditablePositionBeforePositionInRoot(pos.deepEquivalent(), highestRoot); return lastEditableVisiblePositionBeforePositionInRoot(pos.deepEquivalent(), highestRoot);
} }
VisiblePosition VisiblePosition::skipToEndOfEditingBoundary(const VisiblePosition &pos) const VisiblePosition VisiblePosition::skipToEndOfEditingBoundary(const VisiblePosition &pos) const
...@@ -541,7 +541,7 @@ VisiblePosition VisiblePosition::skipToEndOfEditingBoundary(const VisiblePositio ...@@ -541,7 +541,7 @@ VisiblePosition VisiblePosition::skipToEndOfEditingBoundary(const VisiblePositio
return VisiblePosition(Position(highestRootOfPos, Position::PositionIsAfterAnchor).parentAnchoredEquivalent()); return VisiblePosition(Position(highestRootOfPos, Position::PositionIsAfterAnchor).parentAnchoredEquivalent());
// That must mean that |pos| is not editable. Return the next position after pos that is in the same editable region as this position // That must mean that |pos| is not editable. Return the next position after pos that is in the same editable region as this position
return firstEditablePositionAfterPositionInRoot(pos.deepEquivalent(), highestRoot); return firstEditableVisiblePositionAfterPositionInRoot(pos.deepEquivalent(), highestRoot);
} }
static Position canonicalizeCandidate(const Position& candidate) static Position canonicalizeCandidate(const Position& candidate)
......
...@@ -604,7 +604,7 @@ void VisibleSelection::adjustSelectionToAvoidCrossingEditingBoundaries() ...@@ -604,7 +604,7 @@ void VisibleSelection::adjustSelectionToAvoidCrossingEditingBoundaries()
// If the start is in non-editable content that is inside the base's editable root, put it // If the start is in non-editable content that is inside the base's editable root, put it
// at the first editable position after start inside the base's editable root. // at the first editable position after start inside the base's editable root.
if (startRoot != baseRoot) { if (startRoot != baseRoot) {
VisiblePosition first = firstEditablePositionAfterPositionInRoot(m_start, baseRoot); VisiblePosition first = firstEditableVisiblePositionAfterPositionInRoot(m_start, baseRoot);
m_start = first.deepEquivalent(); m_start = first.deepEquivalent();
if (m_start.isNull()) { if (m_start.isNull()) {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
...@@ -615,7 +615,7 @@ void VisibleSelection::adjustSelectionToAvoidCrossingEditingBoundaries() ...@@ -615,7 +615,7 @@ void VisibleSelection::adjustSelectionToAvoidCrossingEditingBoundaries()
// If the end is in non-editable content that is inside the base's root, put it // If the end is in non-editable content that is inside the base's root, put it
// at the last editable position before the end inside the base's root. // at the last editable position before the end inside the base's root.
if (endRoot != baseRoot) { if (endRoot != baseRoot) {
VisiblePosition last = lastEditablePositionBeforePositionInRoot(m_end, baseRoot); VisiblePosition last = lastEditableVisiblePositionBeforePositionInRoot(m_end, baseRoot);
m_end = last.deepEquivalent(); m_end = last.deepEquivalent();
if (m_end.isNull()) if (m_end.isNull())
m_end = m_start; m_end = m_start;
......
...@@ -258,7 +258,7 @@ Position previousVisuallyDistinctCandidate(const Position& position) ...@@ -258,7 +258,7 @@ Position previousVisuallyDistinctCandidate(const Position& position)
return Position(); return Position();
} }
VisiblePosition firstEditablePositionAfterPositionInRoot(const Position& position, Node* highestRoot) VisiblePosition firstEditableVisiblePositionAfterPositionInRoot(const Position& position, Node* highestRoot)
{ {
// position falls before highestRoot. // position falls before highestRoot.
if (comparePositions(position, firstPositionInNode(highestRoot)) == -1 && highestRoot->rendererIsEditable()) if (comparePositions(position, firstPositionInNode(highestRoot)) == -1 && highestRoot->rendererIsEditable())
...@@ -283,7 +283,7 @@ VisiblePosition firstEditablePositionAfterPositionInRoot(const Position& positio ...@@ -283,7 +283,7 @@ VisiblePosition firstEditablePositionAfterPositionInRoot(const Position& positio
return VisiblePosition(p); return VisiblePosition(p);
} }
VisiblePosition lastEditablePositionBeforePositionInRoot(const Position& position, Node* highestRoot) VisiblePosition lastEditableVisiblePositionBeforePositionInRoot(const Position& position, Node* highestRoot)
{ {
// When position falls after highestRoot, the result is easy to compute. // When position falls after highestRoot, the result is easy to compute.
if (comparePositions(position, lastPositionInNode(highestRoot)) == 1) if (comparePositions(position, lastPositionInNode(highestRoot)) == 1)
......
...@@ -173,8 +173,8 @@ void updatePositionForNodeRemoval(Position&, Node&); ...@@ -173,8 +173,8 @@ void updatePositionForNodeRemoval(Position&, Node&);
// Functions returning VisiblePosition // Functions returning VisiblePosition
VisiblePosition firstEditablePositionAfterPositionInRoot(const Position&, Node*); VisiblePosition firstEditableVisiblePositionAfterPositionInRoot(const Position&, Node*);
VisiblePosition lastEditablePositionBeforePositionInRoot(const Position&, Node*); VisiblePosition lastEditableVisiblePositionBeforePositionInRoot(const Position&, Node*);
VisiblePosition visiblePositionBeforeNode(Node&); VisiblePosition visiblePositionBeforeNode(Node&);
VisiblePosition visiblePositionAfterNode(Node&); VisiblePosition visiblePositionAfterNode(Node&);
......
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