| Index: Source/core/editing/FrameSelection.cpp
|
| diff --git a/Source/core/editing/FrameSelection.cpp b/Source/core/editing/FrameSelection.cpp
|
| index f569c89dd61fed3d4ebcf390d5bd4fdd114e5b25..6c697f8184e9e59a7d8012d789043b7d5f29e616 100644
|
| --- a/Source/core/editing/FrameSelection.cpp
|
| +++ b/Source/core/editing/FrameSelection.cpp
|
| @@ -557,13 +557,11 @@ VisiblePosition FrameSelection::nextWordPositionForPlatform(const VisiblePositio
|
| return positionAfterCurrentWord;
|
| }
|
|
|
| -#if ENABLE(USERSELECT_ALL)
|
| static void adjustPositionForUserSelectAll(VisiblePosition& pos, bool isForward)
|
| {
|
| if (Node* rootUserSelectAll = Position::rootUserSelectAllForNode(pos.deepEquivalent().anchorNode()))
|
| pos = isForward ? positionAfterNode(rootUserSelectAll).downstream(CanCrossEditingBoundary) : positionBeforeNode(rootUserSelectAll).upstream(CanCrossEditingBoundary);
|
| }
|
| -#endif
|
|
|
| VisiblePosition FrameSelection::modifyExtendingRight(TextGranularity granularity)
|
| {
|
| @@ -603,9 +601,7 @@ VisiblePosition FrameSelection::modifyExtendingRight(TextGranularity granularity
|
| pos = modifyExtendingForward(granularity);
|
| break;
|
| }
|
| -#if ENABLE(USERSELECT_ALL)
|
| adjustPositionForUserSelectAll(pos, directionOfEnclosingBlock() == LTR);
|
| -#endif
|
| return pos;
|
| }
|
|
|
| @@ -645,9 +641,7 @@ VisiblePosition FrameSelection::modifyExtendingForward(TextGranularity granulari
|
| pos = endOfDocument(pos);
|
| break;
|
| }
|
| -#if ENABLE(USERSELECT_ALL)
|
| - adjustPositionForUserSelectAll(pos, directionOfEnclosingBlock() == LTR);
|
| -#endif
|
| + adjustPositionForUserSelectAll(pos, directionOfEnclosingBlock() == LTR);
|
| return pos;
|
| }
|
|
|
| @@ -770,9 +764,7 @@ VisiblePosition FrameSelection::modifyExtendingLeft(TextGranularity granularity)
|
| pos = modifyExtendingBackward(granularity);
|
| break;
|
| }
|
| -#if ENABLE(USERSELECT_ALL)
|
| adjustPositionForUserSelectAll(pos, !(directionOfEnclosingBlock() == LTR));
|
| -#endif
|
| return pos;
|
| }
|
|
|
| @@ -817,9 +809,7 @@ VisiblePosition FrameSelection::modifyExtendingBackward(TextGranularity granular
|
| pos = startOfDocument(pos);
|
| break;
|
| }
|
| -#if ENABLE(USERSELECT_ALL)
|
| adjustPositionForUserSelectAll(pos, !(directionOfEnclosingBlock() == LTR));
|
| -#endif
|
| return pos;
|
| }
|
|
|
|
|