Relax text validation in FrameSelection::selectWordAroundPosition

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

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1057 matching lines @@
 void FrameSelection::scheduleVisualUpdate() const {
   if (Page* page = m_frame->page())
     page->animator().scheduleVisualUpdate(m_frame->localFrameRoot());
 }
 
 void FrameSelection::scheduleVisualUpdateForPaintInvalidationIfNeeded() const {
   if (FrameView* frameView = m_frame->view())
     frameView->scheduleVisualUpdateForPaintInvalidationIfNeeded();
 }
 
+static bool hasNonSeparatorCharacter(const String& text) {
+  for (unsigned i = 0; i < text.length(); i++) {
+    if (!isSeparator(text.characterStartingAt(i)))
+      return true;
+  }
+  return false;
+}
+
 bool FrameSelection::selectWordAroundPosition(const VisiblePosition& position) {
   static const EWordSide wordSideList[2] = {RightWordIfOnBoundary,
                                             LeftWordIfOnBoundary};
   for (EWordSide wordSide : wordSideList) {
+    // TODO(yoichio): We should have Position version of |start/endOfWord|
+    // for avoiding unnecessary canonicalization.
+    // Then we don't need |hasNonSeparatorCharacter|.
     VisiblePosition start = startOfWord(position, wordSide);
     VisiblePosition end = endOfWord(position, wordSide);
     String text =
         plainText(EphemeralRange(start.deepEquivalent(), end.deepEquivalent()));
-    if (!text.isEmpty() && !isSeparator(text.characterStartingAt(0))) {
+    if (!text.isEmpty() && hasNonSeparatorCharacter(text)) {
       setSelection(SelectionInDOMTree::Builder()
                        .collapse(start.toPositionWithAffinity())
                        .extend(end.deepEquivalent())
                        .build(),
                    CloseTyping | ClearTypingStyle,
                    CursorAlignOnScroll::IfNeeded, WordGranularity);
       return true;
     }
   }
 
@@ skipping 88 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif