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

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

Issue 1203613003: Make inSameLine() in VisibleUnits.cpp to work with positions in composed tree (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-06-24T17:52:54 Get rid of redundant explict in RenderedPosition Created 5 years, 6 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/VisibleUnits.h ('k') | Source/core/editing/VisibleUnitsTest.cpp » ('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 1727f35c65de8f2bf2a0a442fe517ffe7017c58c..8470d00d263cd815ffa4698138afff0046772d77 100644
--- a/Source/core/editing/VisibleUnits.cpp
+++ b/Source/core/editing/VisibleUnits.cpp
@@ -778,6 +778,11 @@ static PositionWithAffinity startOfLine(const PositionWithAffinity& currentPosit
return startOfLine(currentPosition, UseInlineBoxOrdering);
}
+static PositionInComposedTreeWithAffinity startOfLine(const PositionInComposedTreeWithAffinity& currentPosition)
+{
+ return startOfLine(currentPosition, UseInlineBoxOrdering);
+}
+
// FIXME: Rename this function to reflect the fact it ignores bidi levels.
VisiblePosition startOfLine(const VisiblePosition& currentPosition)
{
@@ -900,8 +905,8 @@ bool inSameLineAlgorithm(const PositionWithAffinityType& position1, const Positi
{
if (position1.isNull() || position2.isNull())
return false;
- PositionWithAffinity startOfLine1 = startOfLine(position1);
- PositionWithAffinity startOfLine2 = startOfLine(position2);
+ PositionWithAffinityType startOfLine1 = startOfLine(position1);
+ PositionWithAffinityType startOfLine2 = startOfLine(position2);
if (startOfLine1 == startOfLine2)
return true;
typename PositionWithAffinityType::PositionType canonicalized1 = canonicalPositionOf(startOfLine1.position());
@@ -915,6 +920,11 @@ bool inSameLine(const PositionWithAffinity& a, const PositionWithAffinity& b)
return inSameLineAlgorithm(a, b);
}
+bool inSameLine(const PositionInComposedTreeWithAffinity& position1, const PositionInComposedTreeWithAffinity& position2)
+{
+ return inSameLineAlgorithm(position1, position2);
+}
+
bool inSameLine(const VisiblePosition &a, const VisiblePosition &b)
{
return inSameLine(PositionWithAffinity(a.deepEquivalent(), a.affinity()), PositionWithAffinity(b.deepEquivalent(), b.affinity()));
« no previous file with comments | « Source/core/editing/VisibleUnits.h ('k') | Source/core/editing/VisibleUnitsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698