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

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

Issue 1300303002: Introduce isVisuallyEquivalentCandidate() as replacement of PositionAlgorithm::isCandidate() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-21T01:27:16 Rebase Created 5 years, 4 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: Source/core/editing/VisibleUnits.cpp
diff --git a/Source/core/editing/VisibleUnits.cpp b/Source/core/editing/VisibleUnits.cpp
index 0473b14c4e47c8059b300bd6d2f2300dd2d8bac9..13d9ae5c497294c5cbd774f84df8bf78f73c9519 100644
--- a/Source/core/editing/VisibleUnits.cpp
+++ b/Source/core/editing/VisibleUnits.cpp
@@ -107,7 +107,7 @@ static Position previousRootInlineBoxCandidatePosition(Node* node, const Visible
Position pos = isHTMLBRElement(*previousNode) ? positionBeforeNode(previousNode) :
Position::editingPositionOf(previousNode, caretMaxOffset(previousNode));
- if (pos.isCandidate())
+ if (isVisuallyEquivalentCandidate(pos))
return pos;
previousNode = previousLeafWithSameEditability(previousNode, editableType);
@@ -129,7 +129,7 @@ static Position nextRootInlineBoxCandidatePosition(Node* node, const VisiblePosi
Position pos;
pos = Position::editingPositionOf(nextNode, caretMinOffset(nextNode));
- if (pos.isCandidate())
+ if (isVisuallyEquivalentCandidate(pos))
return pos;
nextNode = nextLeafWithSameEditability(nextNode, editableType);
@@ -1595,10 +1595,10 @@ bool rendersInDifferentPosition(const Position& position1, const Position& posit
return true;
}
- if (isHTMLBRElement(*position1.anchorNode()) && position2.isCandidate())
+ if (isHTMLBRElement(*position1.anchorNode()) && isVisuallyEquivalentCandidate(position2))
return true;
- if (isHTMLBRElement(*position2.anchorNode()) && position1.isCandidate())
+ if (isHTMLBRElement(*position2.anchorNode()) && isVisuallyEquivalentCandidate(position1))
return true;
if (!inSameContainingBlockFlowElement(position1.anchorNode(), position2.anchorNode()))
« no previous file with comments | « Source/core/editing/VisiblePosition.cpp ('k') | Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698