Introduce skipWhitespace() to share VisibleSeleciton::appendTrailingWhitespace() functionality

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

 /*
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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 185 matching lines @@
       pos, PositionTemplate<Strategy>::lastPositionInNode(boundary));
 }
 
 template <typename Strategy>
 void VisibleSelectionTemplate<Strategy>::appendTrailingWhitespace() {
   if (isNone())
     return;
   DCHECK_EQ(m_granularity, WordGranularity);
   if (!isRange())
     return;
-  const EphemeralRangeTemplate<Strategy> searchRange = makeSearchRange(end());
+  const PositionTemplate<Strategy>& newEnd = skipWhitespace(m_end);
+  if (m_end == newEnd)
+    return;
+  m_hasTrailingWhitespace = true;
+  m_end = newEnd;
+}
+
+// TODO(yosin): We should move |skipWhitespaceAlgorithm| to "VisibleUnits.cpp"
+template <typename Strategy>
+static PositionTemplate<Strategy> skipWhitespaceAlgorithm(
+    const PositionTemplate<Strategy>& position) {
+  const EphemeralRangeTemplate<Strategy>& searchRange =
+      makeSearchRange(position);
   if (searchRange.isNull())
-    return;
+    return position;
 
   CharacterIteratorAlgorithm<Strategy> charIt(
       searchRange.startPosition(), searchRange.endPosition(),
       TextIteratorBehavior::Builder()
           .setEmitsCharactersBetweenAllVisiblePositions(true)
           .build());
-  bool changed = false;
-
+  PositionTemplate<Strategy> runner = position;
   for (; charIt.length(); charIt.advance(1)) {
     UChar c = charIt.characterAt(0);
     if ((!isSpaceOrNewline(c) && c != noBreakSpaceCharacter) || c == '\n')
-      break;
-    m_end = charIt.endPosition();
-    changed = true;
+      return runner;
+    runner = charIt.endPosition();
   }
-  if (!changed)
-    return;
-  m_hasTrailingWhitespace = true;
+  return runner;
+}
+
+// TODO(yosin): We should move |skipWhitespace| to "VisibleUnits.cpp"
+Position skipWhitespace(const Position& position) {
+  return skipWhitespaceAlgorithm(position);
+}
+
+// TODO(yosin): We should move |skipWhitespace| to "VisibleUnits.cpp"
+PositionInFlatTree skipWhitespace(const PositionInFlatTree& position) {
+  return skipWhitespaceAlgorithm(position);
 }
 
 template <typename Strategy>
 void VisibleSelectionTemplate<Strategy>::setBaseAndExtentToDeepEquivalents() {
   // Move the selection to rendered positions, if possible.
   bool baseAndExtentEqual = m_base == m_extent;
   if (m_base.isNotNull()) {
     m_base = createVisiblePosition(m_base, m_affinity).deepEquivalent();
     if (baseAndExtentEqual)
       m_extent = m_base;
@@ skipping 563 matching lines @@
 
 void showTree(const blink::VisibleSelectionInFlatTree& sel) {
   sel.showTreeForThis();
 }
 
 void showTree(const blink::VisibleSelectionInFlatTree* sel) {
   if (sel)
     sel->showTreeForThis();
 }
 #endif