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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/editing/SelectionModifier.cpp

Issue 2341053002: Mark the createVisiblePosition overloads as deprecated (Closed)
Patch Set: minor revision Created 4 years, 3 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
« third_party/WebKit/Source/core/editing/RelocatablePositionTest.cpp ('K') | « third_party/WebKit/Source/core/editing/SelectionController.cpp ('k') | third_party/WebKit/Source/core/editing/VisiblePosition.h » ('j') | third_party/WebKit/Source/core/layout/HitTestResult.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/editing/SelectionModifier.cpp
diff --git a/third_party/WebKit/Source/core/editing/SelectionModifier.cpp b/third_party/WebKit/Source/core/editing/SelectionModifier.cpp
index 9445d8f9a1f7f5fdc946ff040beabe4b49d02032..e6f94b961958a1f8d7c97a804e7604d2b247c4ff 100644
--- a/third_party/WebKit/Source/core/editing/SelectionModifier.cpp
+++ b/third_party/WebKit/Source/core/editing/SelectionModifier.cpp
@@ -176,12 +176,12 @@ VisiblePosition SelectionModifier::nextWordPositionForPlatform(const VisiblePosi
static void adjustPositionForUserSelectAll(VisiblePosition& pos, bool isForward)
{
if (Node* rootUserSelectAll = EditingStrategy::rootUserSelectAllForNode(pos.deepEquivalent().anchorNode()))
- pos = createVisiblePosition(isForward ? mostForwardCaretPosition(Position::afterNode(rootUserSelectAll), CanCrossEditingBoundary) : mostBackwardCaretPosition(Position::beforeNode(rootUserSelectAll), CanCrossEditingBoundary));
+ pos = createVisiblePositionDeprecated(isForward ? mostForwardCaretPosition(Position::afterNode(rootUserSelectAll), CanCrossEditingBoundary) : mostBackwardCaretPosition(Position::beforeNode(rootUserSelectAll), CanCrossEditingBoundary));
}
VisiblePosition SelectionModifier::modifyExtendingRight(TextGranularity granularity)
{
- VisiblePosition pos = createVisiblePosition(m_selection.extent(), m_selection.affinity());
+ VisiblePosition pos = createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity());
// The difference between modifyExtendingRight and modifyExtendingForward is:
// modifyExtendingForward always extends forward logically.
@@ -223,7 +223,7 @@ VisiblePosition SelectionModifier::modifyExtendingRight(TextGranularity granular
VisiblePosition SelectionModifier::modifyExtendingForward(TextGranularity granularity)
{
- VisiblePosition pos = createVisiblePosition(m_selection.extent(), m_selection.affinity());
+ VisiblePosition pos = createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity());
switch (granularity) {
case CharacterGranularity:
pos = nextPositionOf(pos, CanSkipOverEditingBoundary);
@@ -268,16 +268,16 @@ VisiblePosition SelectionModifier::modifyMovingRight(TextGranularity granularity
case CharacterGranularity:
if (m_selection.isRange()) {
if (directionOfSelection() == LTR)
- pos = createVisiblePosition(m_selection.end(), m_selection.affinity());
+ pos = createVisiblePositionDeprecated(m_selection.end(), m_selection.affinity());
else
- pos = createVisiblePosition(m_selection.start(), m_selection.affinity());
+ pos = createVisiblePositionDeprecated(m_selection.start(), m_selection.affinity());
} else {
- pos = rightPositionOf(createVisiblePosition(m_selection.extent(), m_selection.affinity()));
+ pos = rightPositionOf(createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity()));
}
break;
case WordGranularity: {
bool skipsSpaceWhenMovingRight = frame() && frame()->editor().behavior().shouldSkipSpaceWhenMovingRight();
- pos = rightWordPosition(createVisiblePosition(m_selection.extent(), m_selection.affinity()), skipsSpaceWhenMovingRight);
+ pos = rightWordPosition(createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity()), skipsSpaceWhenMovingRight);
break;
}
case SentenceGranularity:
@@ -303,15 +303,15 @@ VisiblePosition SelectionModifier::modifyMovingForward(TextGranularity granulari
switch (granularity) {
case CharacterGranularity:
if (m_selection.isRange())
- pos = createVisiblePosition(m_selection.end(), m_selection.affinity());
+ pos = createVisiblePositionDeprecated(m_selection.end(), m_selection.affinity());
else
- pos = nextPositionOf(createVisiblePosition(m_selection.extent(), m_selection.affinity()), CanSkipOverEditingBoundary);
+ pos = nextPositionOf(createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity()), CanSkipOverEditingBoundary);
break;
case WordGranularity:
- pos = nextWordPositionForPlatform(createVisiblePosition(m_selection.extent(), m_selection.affinity()));
+ pos = nextWordPositionForPlatform(createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity()));
break;
case SentenceGranularity:
- pos = nextSentencePosition(createVisiblePosition(m_selection.extent(), m_selection.affinity()));
+ pos = nextSentencePosition(createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity()));
break;
case LineGranularity: {
// down-arrowing from a range selection that ends at the start of a line needs
@@ -346,7 +346,7 @@ VisiblePosition SelectionModifier::modifyMovingForward(TextGranularity granulari
VisiblePosition SelectionModifier::modifyExtendingLeft(TextGranularity granularity)
{
- VisiblePosition pos = createVisiblePosition(m_selection.extent(), m_selection.affinity());
+ VisiblePosition pos = createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity());
// The difference between modifyExtendingLeft and modifyExtendingBackward is:
// modifyExtendingBackward always extends backward logically.
@@ -387,7 +387,7 @@ VisiblePosition SelectionModifier::modifyExtendingLeft(TextGranularity granulari
VisiblePosition SelectionModifier::modifyExtendingBackward(TextGranularity granularity)
{
- VisiblePosition pos = createVisiblePosition(m_selection.extent(), m_selection.affinity());
+ VisiblePosition pos = createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity());
// Extending a selection backward by word or character from just after a table selects
// the table. This "makes sense" from the user perspective, esp. when deleting.
@@ -437,16 +437,16 @@ VisiblePosition SelectionModifier::modifyMovingLeft(TextGranularity granularity)
case CharacterGranularity:
if (m_selection.isRange()) {
if (directionOfSelection() == LTR)
- pos = createVisiblePosition(m_selection.start(), m_selection.affinity());
+ pos = createVisiblePositionDeprecated(m_selection.start(), m_selection.affinity());
else
- pos = createVisiblePosition(m_selection.end(), m_selection.affinity());
+ pos = createVisiblePositionDeprecated(m_selection.end(), m_selection.affinity());
} else {
- pos = leftPositionOf(createVisiblePosition(m_selection.extent(), m_selection.affinity()));
+ pos = leftPositionOf(createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity()));
}
break;
case WordGranularity: {
bool skipsSpaceWhenMovingRight = frame() && frame()->editor().behavior().shouldSkipSpaceWhenMovingRight();
- pos = leftWordPosition(createVisiblePosition(m_selection.extent(), m_selection.affinity()), skipsSpaceWhenMovingRight);
+ pos = leftWordPosition(createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity()), skipsSpaceWhenMovingRight);
break;
}
case SentenceGranularity:
@@ -471,15 +471,15 @@ VisiblePosition SelectionModifier::modifyMovingBackward(TextGranularity granular
switch (granularity) {
case CharacterGranularity:
if (m_selection.isRange())
- pos = createVisiblePosition(m_selection.start(), m_selection.affinity());
+ pos = createVisiblePositionDeprecated(m_selection.start(), m_selection.affinity());
else
- pos = previousPositionOf(createVisiblePosition(m_selection.extent(), m_selection.affinity()), CanSkipOverEditingBoundary);
+ pos = previousPositionOf(createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity()), CanSkipOverEditingBoundary);
break;
case WordGranularity:
- pos = previousWordPosition(createVisiblePosition(m_selection.extent(), m_selection.affinity()));
+ pos = previousWordPosition(createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity()));
break;
case SentenceGranularity:
- pos = previousSentencePosition(createVisiblePosition(m_selection.extent(), m_selection.affinity()));
+ pos = previousSentencePosition(createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity()));
break;
case LineGranularity:
pos = previousLinePosition(startForPlatform(), lineDirectionPointForBlockDirectionNavigation(START));
@@ -642,12 +642,12 @@ bool SelectionModifier::modifyWithPageGranularity(EAlteration alter, unsigned ve
LayoutUnit xPos;
switch (alter) {
case FrameSelection::AlterationMove:
- pos = createVisiblePosition(direction == FrameSelection::DirectionUp ? m_selection.start() : m_selection.end(), m_selection.affinity());
+ pos = createVisiblePositionDeprecated(direction == FrameSelection::DirectionUp ? m_selection.start() : m_selection.end(), m_selection.affinity());
xPos = lineDirectionPointForBlockDirectionNavigation(direction == FrameSelection::DirectionUp ? START : END);
m_selection.setAffinity(direction == FrameSelection::DirectionUp ? TextAffinity::Upstream : TextAffinity::Downstream);
break;
case FrameSelection::AlterationExtend:
- pos = createVisiblePosition(m_selection.extent(), m_selection.affinity());
+ pos = createVisiblePositionDeprecated(m_selection.extent(), m_selection.affinity());
xPos = lineDirectionPointForBlockDirectionNavigation(EXTENT);
m_selection.setAffinity(TextAffinity::Downstream);
break;
@@ -750,7 +750,7 @@ LayoutUnit SelectionModifier::lineDirectionPointForBlockDirectionNavigation(EPos
return x;
if (m_xPosForVerticalArrowNavigation == NoXPosForVerticalArrowNavigation()) {
- VisiblePosition visiblePosition = createVisiblePosition(pos, m_selection.affinity());
+ VisiblePosition visiblePosition = createVisiblePositionDeprecated(pos, m_selection.affinity());
// VisiblePosition creation can fail here if a node containing the selection becomes visibility:hidden
// after the selection is created and before this function is called.
x = lineDirectionPointForBlockDirectionNavigationOf(visiblePosition);
« third_party/WebKit/Source/core/editing/RelocatablePositionTest.cpp ('K') | « third_party/WebKit/Source/core/editing/SelectionController.cpp ('k') | third_party/WebKit/Source/core/editing/VisiblePosition.h » ('j') | third_party/WebKit/Source/core/layout/HitTestResult.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698