Make Selection#modify() with word granularity not to skip punctuation

third_party/WebKit/Source/core/editing/SelectionModifier.cpp

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 bf2ba83044befc9f73c99c7c71f5b6ea83320243..77e0ea5bcd11d3153e84f341429ba76e89b84bc2 100644
--- a/third_party/WebKit/Source/core/editing/SelectionModifier.cpp
+++ b/third_party/WebKit/Source/core/editing/SelectionModifier.cpp
@@ -147,28 +147,11 @@ VisiblePosition SelectionModifier::nextWordPositionForPlatform(
     const VisiblePosition& originalPosition) {
   VisiblePosition positionAfterCurrentWord = nextWordPosition(originalPosition);
 
-  if (frame() &&
-      frame()->editor().behavior().shouldSkipSpaceWhenMovingRight()) {
-    // In order to skip spaces when moving right, we advance one
-    // word further and then move one word back. Given the
-    // semantics of previousWordPosition() this will put us at the
-    // beginning of the word following.
-    VisiblePosition positionAfterSpacingAndFollowingWord =
-        nextWordPosition(positionAfterCurrentWord);
-    if (positionAfterSpacingAndFollowingWord.isNotNull() &&
-        positionAfterSpacingAndFollowingWord.deepEquivalent() !=
-            positionAfterCurrentWord.deepEquivalent())
-      positionAfterCurrentWord =
-          previousWordPosition(positionAfterSpacingAndFollowingWord);
-
-    bool movingBackwardsMovedPositionToStartOfCurrentWord =
-        positionAfterCurrentWord.deepEquivalent() ==
-        previousWordPosition(nextWordPosition(originalPosition))
-            .deepEquivalent();
-    if (movingBackwardsMovedPositionToStartOfCurrentWord)
-      positionAfterCurrentWord = positionAfterSpacingAndFollowingWord;
-  }
-  return positionAfterCurrentWord;
+  if (!frame() ||
+      !frame()->editor().behavior().shouldSkipSpaceWhenMovingRight())
+    return positionAfterCurrentWord;
+  return createVisiblePosition(
+      skipWhitespace(positionAfterCurrentWord.deepEquivalent()));
 }
 
 static void adjustPositionForUserSelectAll(VisiblePosition& pos,