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

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

Issue 1295893006: Move computeInlineBoxPosition out from PositionAlgorithm class (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-20T22:30:52 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
« no previous file with comments | « Source/core/editing/VisiblePosition.h ('k') | Source/core/editing/VisibleUnits.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/VisiblePosition.cpp
diff --git a/Source/core/editing/VisiblePosition.cpp b/Source/core/editing/VisiblePosition.cpp
index 0e0422657c3034e03434361873dc26deb501571f..fe635e38e2fc8f62a85f36fb98c2de486a20469a 100644
--- a/Source/core/editing/VisiblePosition.cpp
+++ b/Source/core/editing/VisiblePosition.cpp
@@ -124,7 +124,7 @@ Position VisiblePosition::leftVisuallyDistinctCandidate() const
TextDirection primaryDirection = primaryDirectionOf(*p.anchorNode());
while (true) {
- InlineBoxPosition boxPosition = p.computeInlineBoxPosition(m_affinity, primaryDirection);
+ InlineBoxPosition boxPosition = computeInlineBoxPosition(p, m_affinity, primaryDirection);
InlineBox* box = boxPosition.inlineBox;
int offset = boxPosition.offsetInBox;
if (!box)
@@ -161,7 +161,7 @@ Position VisiblePosition::leftVisuallyDistinctCandidate() const
if (positionOnLeft.isNull())
return Position();
- InlineBox* boxOnLeft = positionOnLeft.computeInlineBoxPosition(m_affinity, primaryDirection).inlineBox;
+ InlineBox* boxOnLeft = computeInlineBoxPosition(positionOnLeft, m_affinity, primaryDirection).inlineBox;
if (boxOnLeft && boxOnLeft->root() == box->root())
return Position();
return positionOnLeft;
@@ -283,7 +283,7 @@ Position VisiblePosition::rightVisuallyDistinctCandidate() const
TextDirection primaryDirection = primaryDirectionOf(*p.anchorNode());
while (true) {
- InlineBoxPosition boxPosition = p.computeInlineBoxPosition(m_affinity, primaryDirection);
+ InlineBoxPosition boxPosition = computeInlineBoxPosition(p, m_affinity, primaryDirection);
InlineBox* box = boxPosition.inlineBox;
int offset = boxPosition.offsetInBox;
if (!box)
@@ -320,7 +320,7 @@ Position VisiblePosition::rightVisuallyDistinctCandidate() const
if (positionOnRight.isNull())
return Position();
- InlineBox* boxOnRight = positionOnRight.computeInlineBoxPosition(m_affinity, primaryDirection).inlineBox;
+ InlineBox* boxOnRight = computeInlineBoxPosition(positionOnRight, m_affinity, primaryDirection).inlineBox;
if (boxOnRight && boxOnRight->root() == box->root())
return Position();
return positionOnRight;
« no previous file with comments | « Source/core/editing/VisiblePosition.h ('k') | Source/core/editing/VisibleUnits.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698