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 325e9df81fc7046fe07e09bc30f1cf26620a3db9..81fb05750f6e0fad9a5efd69a64969687b4811c0 100644 |
--- a/third_party/WebKit/Source/core/editing/SelectionModifier.cpp |
+++ b/third_party/WebKit/Source/core/editing/SelectionModifier.cpp |
@@ -100,7 +100,7 @@ void SelectionModifier::willBeModified(EAlteration alter, |
} else { |
switch (direction) { |
case DirectionRight: |
- if (directionOfSelection() == TextDirection::Ltr) |
+ if (directionOfSelection() == TextDirection::kLtr) |
baseIsStart = true; |
else |
baseIsStart = false; |
@@ -109,7 +109,7 @@ void SelectionModifier::willBeModified(EAlteration alter, |
baseIsStart = true; |
break; |
case DirectionLeft: |
- if (directionOfSelection() == TextDirection::Ltr) |
+ if (directionOfSelection() == TextDirection::kLtr) |
baseIsStart = false; |
else |
baseIsStart = true; |
@@ -202,19 +202,19 @@ VisiblePosition SelectionModifier::modifyExtendingRight( |
// block is RTL direction. |
switch (granularity) { |
case CharacterGranularity: |
- if (directionOfEnclosingBlock() == TextDirection::Ltr) |
+ if (directionOfEnclosingBlock() == TextDirection::kLtr) |
pos = nextPositionOf(pos, CanSkipOverEditingBoundary); |
else |
pos = previousPositionOf(pos, CanSkipOverEditingBoundary); |
break; |
case WordGranularity: |
- if (directionOfEnclosingBlock() == TextDirection::Ltr) |
+ if (directionOfEnclosingBlock() == TextDirection::kLtr) |
pos = nextWordPositionForPlatform(pos); |
else |
pos = previousWordPosition(pos); |
break; |
case LineBoundary: |
- if (directionOfEnclosingBlock() == TextDirection::Ltr) |
+ if (directionOfEnclosingBlock() == TextDirection::kLtr) |
pos = modifyExtendingForward(granularity); |
else |
pos = modifyExtendingBackward(granularity); |
@@ -230,7 +230,7 @@ VisiblePosition SelectionModifier::modifyExtendingRight( |
break; |
} |
adjustPositionForUserSelectAll( |
- pos, directionOfEnclosingBlock() == TextDirection::Ltr); |
+ pos, directionOfEnclosingBlock() == TextDirection::kLtr); |
return pos; |
} |
@@ -274,7 +274,7 @@ VisiblePosition SelectionModifier::modifyExtendingForward( |
break; |
} |
adjustPositionForUserSelectAll( |
- pos, directionOfEnclosingBlock() == TextDirection::Ltr); |
+ pos, directionOfEnclosingBlock() == TextDirection::kLtr); |
return pos; |
} |
@@ -284,7 +284,7 @@ VisiblePosition SelectionModifier::modifyMovingRight( |
switch (granularity) { |
case CharacterGranularity: |
if (m_selection.isRange()) { |
- if (directionOfSelection() == TextDirection::Ltr) |
+ if (directionOfSelection() == TextDirection::kLtr) |
pos = |
createVisiblePosition(m_selection.end(), m_selection.affinity()); |
else |
@@ -390,19 +390,19 @@ VisiblePosition SelectionModifier::modifyExtendingLeft( |
// block is RTL direction. |
switch (granularity) { |
case CharacterGranularity: |
- if (directionOfEnclosingBlock() == TextDirection::Ltr) |
+ if (directionOfEnclosingBlock() == TextDirection::kLtr) |
pos = previousPositionOf(pos, CanSkipOverEditingBoundary); |
else |
pos = nextPositionOf(pos, CanSkipOverEditingBoundary); |
break; |
case WordGranularity: |
- if (directionOfEnclosingBlock() == TextDirection::Ltr) |
+ if (directionOfEnclosingBlock() == TextDirection::kLtr) |
pos = previousWordPosition(pos); |
else |
pos = nextWordPositionForPlatform(pos); |
break; |
case LineBoundary: |
- if (directionOfEnclosingBlock() == TextDirection::Ltr) |
+ if (directionOfEnclosingBlock() == TextDirection::kLtr) |
pos = modifyExtendingBackward(granularity); |
else |
pos = modifyExtendingForward(granularity); |
@@ -417,7 +417,7 @@ VisiblePosition SelectionModifier::modifyExtendingLeft( |
break; |
} |
adjustPositionForUserSelectAll( |
- pos, !(directionOfEnclosingBlock() == TextDirection::Ltr)); |
+ pos, !(directionOfEnclosingBlock() == TextDirection::kLtr)); |
return pos; |
} |
@@ -466,7 +466,7 @@ VisiblePosition SelectionModifier::modifyExtendingBackward( |
break; |
} |
adjustPositionForUserSelectAll( |
- pos, !(directionOfEnclosingBlock() == TextDirection::Ltr)); |
+ pos, !(directionOfEnclosingBlock() == TextDirection::kLtr)); |
return pos; |
} |
@@ -476,7 +476,7 @@ VisiblePosition SelectionModifier::modifyMovingLeft( |
switch (granularity) { |
case CharacterGranularity: |
if (m_selection.isRange()) { |
- if (directionOfSelection() == TextDirection::Ltr) |
+ if (directionOfSelection() == TextDirection::kLtr) |
pos = createVisiblePosition(m_selection.start(), |
m_selection.affinity()); |
else |
@@ -685,9 +685,10 @@ bool SelectionModifier::modify(EAlteration alter, |
} else { |
TextDirection textDirection = directionOfEnclosingBlock(); |
if (direction == DirectionForward || |
- (textDirection == TextDirection::Ltr && |
+ (textDirection == TextDirection::kLtr && |
direction == DirectionRight) || |
- (textDirection == TextDirection::Rtl && direction == DirectionLeft)) |
+ (textDirection == TextDirection::kRtl && |
+ direction == DirectionLeft)) |
setSelectionEnd(&m_selection, position); |
else |
setSelectionStart(&m_selection, position); |