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

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

Issue 22751005: Convert USERSELECT_ALL to a runtime enabled feature. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review feedback. Created 7 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
Index: Source/core/editing/FrameSelection.cpp
diff --git a/Source/core/editing/FrameSelection.cpp b/Source/core/editing/FrameSelection.cpp
index f569c89dd61fed3d4ebcf390d5bd4fdd114e5b25..762ad17ee4cd192bcf406b5ff8a50a3d00b3b1c2 100644
--- a/Source/core/editing/FrameSelection.cpp
+++ b/Source/core/editing/FrameSelection.cpp
@@ -557,13 +557,14 @@ VisiblePosition FrameSelection::nextWordPositionForPlatform(const VisiblePositio
return positionAfterCurrentWord;
}
-#if ENABLE(USERSELECT_ALL)
static void adjustPositionForUserSelectAll(VisiblePosition& pos, bool isForward)
{
+ if (!RuntimeEnabledFeatures::userSelectAllEnabled())
adamk 2013/08/09 22:28:34 You can avoid this since rootUserSelectAlLForNode(
+ return;
+
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 +604,7 @@ VisiblePosition FrameSelection::modifyExtendingRight(TextGranularity granularity
pos = modifyExtendingForward(granularity);
break;
}
-#if ENABLE(USERSELECT_ALL)
adjustPositionForUserSelectAll(pos, directionOfEnclosingBlock() == LTR);
-#endif
return pos;
}
@@ -645,9 +644,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 +767,7 @@ VisiblePosition FrameSelection::modifyExtendingLeft(TextGranularity granularity)
pos = modifyExtendingBackward(granularity);
break;
}
-#if ENABLE(USERSELECT_ALL)
adjustPositionForUserSelectAll(pos, !(directionOfEnclosingBlock() == LTR));
-#endif
return pos;
}
@@ -817,9 +812,7 @@ VisiblePosition FrameSelection::modifyExtendingBackward(TextGranularity granular
pos = startOfDocument(pos);
break;
}
-#if ENABLE(USERSELECT_ALL)
adjustPositionForUserSelectAll(pos, !(directionOfEnclosingBlock() == LTR));
-#endif
return pos;
}

Powered by Google App Engine
This is Rietveld 408576698