Index: Source/core/editing/VisibleUnits.cpp |
diff --git a/Source/core/editing/VisibleUnits.cpp b/Source/core/editing/VisibleUnits.cpp |
index 9e803fcfdc94d0bdf0a0495a6345ccb0fedb1236..c32fa828f39e2c25082d8feb9995d154b10bcccd 100644 |
--- a/Source/core/editing/VisibleUnits.cpp |
+++ b/Source/core/editing/VisibleUnits.cpp |
@@ -27,6 +27,7 @@ |
#include "core/editing/VisibleUnits.h" |
#include "HTMLNames.h" |
+#include "RuntimeEnabledFeatures.h" |
#include "bindings/v8/ExceptionState.h" |
#include "bindings/v8/ExceptionStatePlaceholder.h" |
#include "core/dom/Document.h" |
@@ -1109,11 +1110,9 @@ VisiblePosition startOfParagraph(const VisiblePosition& c, EditingBoundaryCrossi |
Node* n = startNode; |
while (n) { |
-#if ENABLE(USERSELECT_ALL) |
- if (boundaryCrossingRule == CannotCrossEditingBoundary && !Position::nodeIsUserSelectAll(n) && n->rendererIsEditable() != startNode->rendererIsEditable()) |
-#else |
- if (boundaryCrossingRule == CannotCrossEditingBoundary && n->rendererIsEditable() != startNode->rendererIsEditable()) |
-#endif |
+ if (boundaryCrossingRule == CannotCrossEditingBoundary |
+ && n->rendererIsEditable() != startNode->rendererIsEditable() |
+ && (!RuntimeEnabledFeatures::userSelectAllEnabled() || !Position::nodeIsUserSelectAll(n))) |
break; |
if (boundaryCrossingRule == CanSkipOverEditingBoundary) { |
while (n && n->rendererIsEditable() != startNode->rendererIsEditable()) |
@@ -1189,11 +1188,9 @@ VisiblePosition endOfParagraph(const VisiblePosition &c, EditingBoundaryCrossing |
Node* n = startNode; |
while (n) { |
-#if ENABLE(USERSELECT_ALL) |
- if (boundaryCrossingRule == CannotCrossEditingBoundary && !Position::nodeIsUserSelectAll(n) && n->rendererIsEditable() != startNode->rendererIsEditable()) |
-#else |
- if (boundaryCrossingRule == CannotCrossEditingBoundary && n->rendererIsEditable() != startNode->rendererIsEditable()) |
-#endif |
+ if (boundaryCrossingRule == CannotCrossEditingBoundary |
+ && n->rendererIsEditable() != startNode->rendererIsEditable() |
+ && (!RuntimeEnabledFeatures::userSelectAllEnabled() || !Position::nodeIsUserSelectAll(n))) |
break; |
if (boundaryCrossingRule == CanSkipOverEditingBoundary) { |
while (n && n->rendererIsEditable() != startNode->rendererIsEditable()) |