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

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

Issue 1299873002: ALL-IN-ONE Introduce enum class TextAffinity (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-19T18:08:52 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/VisibleSelection.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/VisibleSelection.cpp
diff --git a/Source/core/editing/VisibleSelection.cpp b/Source/core/editing/VisibleSelection.cpp
index 5aa3afef6f200385638372ffffaea386e171b25f..c75427392d73d4ebe335472f5e4fbd612df3bc56 100644
--- a/Source/core/editing/VisibleSelection.cpp
+++ b/Source/core/editing/VisibleSelection.cpp
@@ -42,7 +42,7 @@
namespace blink {
VisibleSelection::VisibleSelection()
- : m_affinity(DOWNSTREAM)
+ : m_affinity(TextAffinity::Downstream)
, m_changeObserver(nullptr)
, m_selectionType(NoSelection)
, m_baseIsFirst(true)
@@ -50,12 +50,12 @@ VisibleSelection::VisibleSelection()
{
}
-VisibleSelection::VisibleSelection(const Position& pos, EAffinity affinity, bool isDirectional)
+VisibleSelection::VisibleSelection(const Position& pos, TextAffinity affinity, bool isDirectional)
: VisibleSelection(pos, pos, affinity, isDirectional)
{
}
-VisibleSelection::VisibleSelection(const Position& base, const Position& extent, EAffinity affinity, bool isDirectional)
+VisibleSelection::VisibleSelection(const Position& base, const Position& extent, TextAffinity affinity, bool isDirectional)
: m_base(base)
, m_extent(extent)
, m_affinity(affinity)
@@ -65,7 +65,7 @@ VisibleSelection::VisibleSelection(const Position& base, const Position& extent,
validate();
}
-VisibleSelection::VisibleSelection(const PositionInComposedTree& base, const PositionInComposedTree& extent, EAffinity affinity, bool isDirectional)
+VisibleSelection::VisibleSelection(const PositionInComposedTree& base, const PositionInComposedTree& extent, TextAffinity affinity, bool isDirectional)
: VisibleSelection(toPositionInDOMTree(base), toPositionInDOMTree(extent), affinity, isDirectional)
{
}
@@ -80,12 +80,12 @@ VisibleSelection::VisibleSelection(const VisiblePosition& base, const VisiblePos
{
}
-VisibleSelection::VisibleSelection(const EphemeralRange& range, EAffinity affinity, bool isDirectional)
+VisibleSelection::VisibleSelection(const EphemeralRange& range, TextAffinity affinity, bool isDirectional)
: VisibleSelection(range.startPosition(), range.endPosition(), affinity, isDirectional)
{
}
-VisibleSelection::VisibleSelection(const Range* range, EAffinity affinity, bool isDirectional)
+VisibleSelection::VisibleSelection(const Range* range, TextAffinity affinity, bool isDirectional)
: VisibleSelection(range->startPosition(), range->endPosition(), affinity, isDirectional)
{
}
@@ -603,7 +603,7 @@ void VisibleSelection::updateSelectionType()
// Affinity only makes sense for a caret
if (m_selectionType != CaretSelection)
- m_affinity = DOWNSTREAM;
+ m_affinity = TextAffinity::Downstream;
}
static Node* enclosingShadowHost(Node* node)
@@ -763,7 +763,7 @@ void VisibleSelection::setWithoutValidation(const Position& base, const Position
// TODO(hajimehoshi): We doubt this assertion is needed. This was introduced
// by http://trac.webkit.org/browser/trunk/WebCore/editing/Selection.cpp?annotate=blame&rev=21071
- ASSERT(m_affinity == DOWNSTREAM);
+ ASSERT(m_affinity == TextAffinity::Downstream);
m_base = base;
m_extent = extent;
@@ -1205,7 +1205,7 @@ void VisibleSelection::debugPosition(const char* message) const
}
fprintf(stderr, "isDirectional=%s\n", isDirectional() ? "true" : "false");
- fprintf(stderr, "affinity=%s\n", affinity() == DOWNSTREAM ? "DOWNSTREaM" : affinity() == UPSTREAM ? "UPSTREAM" : "UNKNOWN");
+ fprintf(stderr, "affinity=%s\n", affinity() == TextAffinity::Downstream ? "DOWNSTREaM" : affinity() == TextAffinity::Upstream ? "UPSTREAM" : "UNKNOWN");
fprintf(stderr, "================================\n");
}
« no previous file with comments | « Source/core/editing/VisibleSelection.h ('k') | Source/core/editing/VisibleUnits.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698