Get rid of VisibleSelection::expandUsingGranularity()

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/editing/VisibleSelection.h"
 
 #include "core/dom/Range.h"
 #include "core/editing/EditingTestBase.h"
 #include "core/editing/SelectionAdjuster.h"
 
@@ skipping 38 matching lines @@
   // shadow root, not distributed node, we map a position in flat tree
   // to DOM tree position.
   EXPECT_EQ(selection.start(),
             toPositionInDOMTree(selectionInFlatTree.start()));
   EXPECT_EQ(selection.end(), toPositionInDOMTree(selectionInFlatTree.end()));
   EXPECT_EQ(selection.base(), toPositionInDOMTree(selectionInFlatTree.base()));
   EXPECT_EQ(selection.extent(),
             toPositionInDOMTree(selectionInFlatTree.extent()));
 }
 
+template <typename Strategy>
+VisibleSelectionTemplate<Strategy> expandUsingGranularity(
+    const VisibleSelectionTemplate<Strategy>& selection,
+    TextGranularity granularity) {
+  return createVisibleSelection(
+      typename SelectionTemplate<Strategy>::Builder()
+          .setBaseAndExtent(selection.base(), selection.extent())
+          .setGranularity(granularity)
+          .build());
+}
+
 TEST_F(VisibleSelectionTest, expandUsingGranularity) {
   const char* bodyContent =
       "<span id=host><a id=one>1</a><a id=two>22</a></span>";
   const char* shadowContent =
       "<p><b id=three>333</b><content select=#two></content><b "
       "id=four>4444</b><span id=space>  </span><content "
       "select=#one></content><b id=five>55555</b></p>";
   setBodyContent(bodyContent);
   ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
   Node* one = document().getElementById("one")->firstChild();
   Node* two = document().getElementById("two")->firstChild();
   Node* three = shadowRoot->getElementById("three")->firstChild();
   Node* four = shadowRoot->getElementById("four")->firstChild();
   Node* five = shadowRoot->getElementById("five")->firstChild();
 
   VisibleSelection selection;
   VisibleSelectionInFlatTree selectionInFlatTree;
 
   // From a position at distributed node
   selection = createVisibleSelection(
       SelectionInDOMTree::Builder().collapse(Position(one, 1)).build());
-  selection.expandUsingGranularity(WordGranularity);
+  selection = expandUsingGranularity(selection, WordGranularity);
   selectionInFlatTree =
       createVisibleSelection(SelectionInFlatTree::Builder()
                                  .collapse(PositionInFlatTree(one, 1))
                                  .build());
-  selectionInFlatTree.expandUsingGranularity(WordGranularity);
+  selectionInFlatTree =
+      expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
   EXPECT_EQ(Position(one, 1), selection.base());
   EXPECT_EQ(Position(one, 1), selection.extent());
   EXPECT_EQ(Position(one, 0), selection.start());
   EXPECT_EQ(Position(two, 2), selection.end());
 
   EXPECT_EQ(PositionInFlatTree(one, 1), selectionInFlatTree.base());
   EXPECT_EQ(PositionInFlatTree(one, 1), selectionInFlatTree.extent());
   EXPECT_EQ(PositionInFlatTree(one, 0), selectionInFlatTree.start());
   EXPECT_EQ(PositionInFlatTree(five, 5), selectionInFlatTree.end());
 
   // From a position at distributed node
   selection = createVisibleSelection(
       SelectionInDOMTree::Builder().collapse(Position(two, 1)).build());
-  selection.expandUsingGranularity(WordGranularity);
+  selection = expandUsingGranularity(selection, WordGranularity);
   selectionInFlatTree =
       createVisibleSelection(SelectionInFlatTree::Builder()
                                  .collapse(PositionInFlatTree(two, 1))
                                  .build());
-  selectionInFlatTree.expandUsingGranularity(WordGranularity);
+  selectionInFlatTree =
+      expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
   EXPECT_EQ(Position(two, 1), selection.base());
   EXPECT_EQ(Position(two, 1), selection.extent());
   EXPECT_EQ(Position(one, 0), selection.start());
   EXPECT_EQ(Position(two, 2), selection.end());
 
   EXPECT_EQ(PositionInFlatTree(two, 1), selectionInFlatTree.base());
   EXPECT_EQ(PositionInFlatTree(two, 1), selectionInFlatTree.extent());
   EXPECT_EQ(PositionInFlatTree(three, 0), selectionInFlatTree.start());
   EXPECT_EQ(PositionInFlatTree(four, 4), selectionInFlatTree.end());
 
   // From a position at node in shadow tree
   selection = createVisibleSelection(
       SelectionInDOMTree::Builder().collapse(Position(three, 1)).build());
-  selection.expandUsingGranularity(WordGranularity);
+  selection = expandUsingGranularity(selection, WordGranularity);
   selectionInFlatTree =
       createVisibleSelection(SelectionInFlatTree::Builder()
                                  .collapse(PositionInFlatTree(three, 1))
                                  .build());
-  selectionInFlatTree.expandUsingGranularity(WordGranularity);
+  selectionInFlatTree =
+      expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
   EXPECT_EQ(Position(three, 1), selection.base());
   EXPECT_EQ(Position(three, 1), selection.extent());
   EXPECT_EQ(Position(three, 0), selection.start());
   EXPECT_EQ(Position(four, 4), selection.end());
 
   EXPECT_EQ(PositionInFlatTree(three, 1), selectionInFlatTree.base());
   EXPECT_EQ(PositionInFlatTree(three, 1), selectionInFlatTree.extent());
   EXPECT_EQ(PositionInFlatTree(three, 0), selectionInFlatTree.start());
   EXPECT_EQ(PositionInFlatTree(four, 4), selectionInFlatTree.end());
 
   // From a position at node in shadow tree
   selection = createVisibleSelection(
       SelectionInDOMTree::Builder().collapse(Position(four, 1)).build());
-  selection.expandUsingGranularity(WordGranularity);
+  selection = expandUsingGranularity(selection, WordGranularity);
   selectionInFlatTree =
       createVisibleSelection(SelectionInFlatTree::Builder()
                                  .collapse(PositionInFlatTree(four, 1))
                                  .build());
-  selectionInFlatTree.expandUsingGranularity(WordGranularity);
+  selectionInFlatTree =
+      expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
   EXPECT_EQ(Position(four, 1), selection.base());
   EXPECT_EQ(Position(four, 1), selection.extent());
   EXPECT_EQ(Position(three, 0), selection.start());
   EXPECT_EQ(Position(four, 4), selection.end());
 
   EXPECT_EQ(PositionInFlatTree(four, 1), selectionInFlatTree.base());
   EXPECT_EQ(PositionInFlatTree(four, 1), selectionInFlatTree.extent());
   EXPECT_EQ(PositionInFlatTree(three, 0), selectionInFlatTree.start());
   EXPECT_EQ(PositionInFlatTree(four, 4), selectionInFlatTree.end());
 
   // From a position at node in shadow tree
   selection = createVisibleSelection(
       SelectionInDOMTree::Builder().collapse(Position(five, 1)).build());
-  selection.expandUsingGranularity(WordGranularity);
+  selection = expandUsingGranularity(selection, WordGranularity);
   selectionInFlatTree =
       createVisibleSelection(SelectionInFlatTree::Builder()
                                  .collapse(PositionInFlatTree(five, 1))
                                  .build());
-  selectionInFlatTree.expandUsingGranularity(WordGranularity);
+  selectionInFlatTree =
+      expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
   EXPECT_EQ(Position(five, 1), selection.base());
   EXPECT_EQ(Position(five, 1), selection.extent());
   EXPECT_EQ(Position(five, 0), selection.start());
   EXPECT_EQ(Position(five, 5), selection.end());
 
   EXPECT_EQ(PositionInFlatTree(five, 1), selectionInFlatTree.base());
   EXPECT_EQ(PositionInFlatTree(five, 1), selectionInFlatTree.extent());
   EXPECT_EQ(PositionInFlatTree(one, 0), selectionInFlatTree.start());
   EXPECT_EQ(PositionInFlatTree(five, 5), selectionInFlatTree.end());
@@ skipping 139 matching lines @@
 TEST_F(VisibleSelectionTest, WordGranularity) {
   setBodyContent(LOREM_IPSUM);
 
   VisibleSelection selection;
   VisibleSelectionInFlatTree selectionInFlatTree;
 
   // Beginning of a word.
   {
     setSelection(selection, 0);
     setSelection(selectionInFlatTree, 0);
-    selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree.expandUsingGranularity(WordGranularity);
+    selection = expandUsingGranularity(selection, WordGranularity);
+    selectionInFlatTree =
+        expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
     Range* range = firstRangeOf(selection);
     EXPECT_EQ(0, range->startOffset());
     EXPECT_EQ(5, range->endOffset());
     EXPECT_EQ("Lorem", range->text());
     testFlatTreePositionsToEqualToDOMTreePositions(selection,
                                                    selectionInFlatTree);
   }
 
   // Middle of a word.
   {
     setSelection(selection, 8);
     setSelection(selectionInFlatTree, 8);
-    selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree.expandUsingGranularity(WordGranularity);
+    selection = expandUsingGranularity(selection, WordGranularity);
+    selectionInFlatTree =
+        expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
     Range* range = firstRangeOf(selection);
     EXPECT_EQ(6, range->startOffset());
     EXPECT_EQ(11, range->endOffset());
     EXPECT_EQ("ipsum", range->text());
     testFlatTreePositionsToEqualToDOMTreePositions(selection,
                                                    selectionInFlatTree);
   }
 
   // End of a word.
   // FIXME: that sounds buggy, we might want to select the word _before_ instead
   // of the space...
   {
     setSelection(selection, 5);
     setSelection(selectionInFlatTree, 5);
-    selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree.expandUsingGranularity(WordGranularity);
+    selection = expandUsingGranularity(selection, WordGranularity);
+    selectionInFlatTree =
+        expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
     Range* range = firstRangeOf(selection);
     EXPECT_EQ(5, range->startOffset());
     EXPECT_EQ(6, range->endOffset());
     EXPECT_EQ(" ", range->text());
     testFlatTreePositionsToEqualToDOMTreePositions(selection,
                                                    selectionInFlatTree);
   }
 
   // Before comma.
   // FIXME: that sounds buggy, we might want to select the word _before_ instead
   // of the comma.
   {
     setSelection(selection, 26);
     setSelection(selectionInFlatTree, 26);
-    selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree.expandUsingGranularity(WordGranularity);
+    selection = expandUsingGranularity(selection, WordGranularity);
+    selectionInFlatTree =
+        expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
     Range* range = firstRangeOf(selection);
     EXPECT_EQ(26, range->startOffset());
     EXPECT_EQ(27, range->endOffset());
     EXPECT_EQ(",", range->text());
     testFlatTreePositionsToEqualToDOMTreePositions(selection,
                                                    selectionInFlatTree);
   }
 
   // After comma.
   {
     setSelection(selection, 27);
     setSelection(selectionInFlatTree, 27);
-    selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree.expandUsingGranularity(WordGranularity);
+    selection = expandUsingGranularity(selection, WordGranularity);
+    selectionInFlatTree =
+        expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
     Range* range = firstRangeOf(selection);
     EXPECT_EQ(27, range->startOffset());
     EXPECT_EQ(28, range->endOffset());
     EXPECT_EQ(" ", range->text());
     testFlatTreePositionsToEqualToDOMTreePositions(selection,
                                                    selectionInFlatTree);
   }
 
   // When selecting part of a word.
   {
     setSelection(selection, 0, 1);
     setSelection(selectionInFlatTree, 0, 1);
-    selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree.expandUsingGranularity(WordGranularity);
+    selection = expandUsingGranularity(selection, WordGranularity);
+    selectionInFlatTree =
+        expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
     Range* range = firstRangeOf(selection);
     EXPECT_EQ(0, range->startOffset());
     EXPECT_EQ(5, range->endOffset());
     EXPECT_EQ("Lorem", range->text());
     testFlatTreePositionsToEqualToDOMTreePositions(selection,
                                                    selectionInFlatTree);
   }
 
   // When selecting part of two words.
   {
     setSelection(selection, 2, 8);
     setSelection(selectionInFlatTree, 2, 8);
-    selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree.expandUsingGranularity(WordGranularity);
+    selection = expandUsingGranularity(selection, WordGranularity);
+    selectionInFlatTree =
+        expandUsingGranularity(selectionInFlatTree, WordGranularity);
 
     Range* range = firstRangeOf(selection);
     EXPECT_EQ(0, range->startOffset());
     EXPECT_EQ(11, range->endOffset());
     EXPECT_EQ("Lorem ipsum", range->text());
     testFlatTreePositionsToEqualToDOMTreePositions(selection,
                                                    selectionInFlatTree);
   }
 }
 
@@ skipping 20 matching lines @@
   selection.updateIfNeeded();
   EXPECT_EQ(Position(sample->firstChild(), 0), selection.start());
 
   VisibleSelectionInFlatTree selectionInFlatTree;
   SelectionAdjuster::adjustSelectionInFlatTree(&selectionInFlatTree, selection);
   EXPECT_EQ(PositionInFlatTree(sample->firstChild(), 0),
             selectionInFlatTree.start());
 }
 
 }  // namespace blink