Rename ComposedTree to FlatTree

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"
 
 #define LOREM_IPSUM \
@@ skipping 18 matching lines @@
     // Helper function to set the VisibleSelection base/extent.
     template <typename Strategy>
     void setSelection(VisibleSelectionTemplate<Strategy>& selection, int base, int extend)
     {
         Node* node = document().body()->firstChild();
         selection.setBase(PositionTemplate<Strategy>(node, base));
         selection.setExtent(PositionTemplate<Strategy>(node, extend));
     }
 };
 
-static void testComposedTreePositionsToEqualToDOMTreePositions(const VisibleSelection& selection, const VisibleSelectionInComposedTree& selectionInComposedTree)
+static void testFlatTreePositionsToEqualToDOMTreePositions(const VisibleSelection& selection, const VisibleSelectionInFlatTree& selectionInFlatTree)
 {
-    // Since DOM tree positions can't be map to composed tree version, e.g.
-    // shadow root, not distributed node, we map a position in composed tree
+    // Since DOM tree positions can't be map to flat tree version, e.g.
+    // shadow root, not distributed node, we map a position in flat tree
     // to DOM tree position.
-    EXPECT_EQ(selection.start(), toPositionInDOMTree(selectionInComposedTree.start()));
-    EXPECT_EQ(selection.end(), toPositionInDOMTree(selectionInComposedTree.end()));
-    EXPECT_EQ(selection.base(), toPositionInDOMTree(selectionInComposedTree.base()));
-    EXPECT_EQ(selection.extent(), toPositionInDOMTree(selectionInComposedTree.extent()));
+    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()));
 }
 
 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);
     RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
     updateLayoutAndStyleForPainting();
 
     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;
-    VisibleSelectionInComposedTree selectionInComposedTree;
+    VisibleSelectionInFlatTree selectionInFlatTree;
 
     // From a position at distributed node
     selection = VisibleSelection(createVisiblePosition(Position(one, 1)));
     selection.expandUsingGranularity(WordGranularity);
-    selectionInComposedTree = VisibleSelectionInComposedTree(createVisiblePosition(PositionInComposedTree(one, 1)));
-    selectionInComposedTree.expandUsingGranularity(WordGranularity);
+    selectionInFlatTree = VisibleSelectionInFlatTree(createVisiblePosition(PositionInFlatTree(one, 1)));
+    selectionInFlatTree.expandUsingGranularity(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(PositionInComposedTree(one, 1), selectionInComposedTree.base());
-    EXPECT_EQ(PositionInComposedTree(one, 1), selectionInComposedTree.extent());
-    EXPECT_EQ(PositionInComposedTree(one, 0), selectionInComposedTree.start());
-    EXPECT_EQ(PositionInComposedTree(five, 5), selectionInComposedTree.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 = VisibleSelection(createVisiblePosition(Position(two, 1)));
     selection.expandUsingGranularity(WordGranularity);
-    selectionInComposedTree = VisibleSelectionInComposedTree(createVisiblePosition(PositionInComposedTree(two, 1)));
-    selectionInComposedTree.expandUsingGranularity(WordGranularity);
+    selectionInFlatTree = VisibleSelectionInFlatTree(createVisiblePosition(PositionInFlatTree(two, 1)));
+    selectionInFlatTree.expandUsingGranularity(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(PositionInComposedTree(two, 1), selectionInComposedTree.base());
-    EXPECT_EQ(PositionInComposedTree(two, 1), selectionInComposedTree.extent());
-    EXPECT_EQ(PositionInComposedTree(three, 0), selectionInComposedTree.start());
-    EXPECT_EQ(PositionInComposedTree(four, 4), selectionInComposedTree.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 = VisibleSelection(createVisiblePosition(Position(three, 1)));
     selection.expandUsingGranularity(WordGranularity);
-    selectionInComposedTree = VisibleSelectionInComposedTree(createVisiblePosition(PositionInComposedTree(three, 1)));
-    selectionInComposedTree.expandUsingGranularity(WordGranularity);
+    selectionInFlatTree = VisibleSelectionInFlatTree(createVisiblePosition(PositionInFlatTree(three, 1)));
+    selectionInFlatTree.expandUsingGranularity(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(PositionInComposedTree(three, 1), selectionInComposedTree.base());
-    EXPECT_EQ(PositionInComposedTree(three, 1), selectionInComposedTree.extent());
-    EXPECT_EQ(PositionInComposedTree(three, 0), selectionInComposedTree.start());
-    EXPECT_EQ(PositionInComposedTree(four, 4), selectionInComposedTree.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 = VisibleSelection(createVisiblePosition(Position(four, 1)));
     selection.expandUsingGranularity(WordGranularity);
-    selectionInComposedTree = VisibleSelectionInComposedTree(createVisiblePosition(PositionInComposedTree(four, 1)));
-    selectionInComposedTree.expandUsingGranularity(WordGranularity);
+    selectionInFlatTree = VisibleSelectionInFlatTree(createVisiblePosition(PositionInFlatTree(four, 1)));
+    selectionInFlatTree.expandUsingGranularity(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(PositionInComposedTree(four, 1), selectionInComposedTree.base());
-    EXPECT_EQ(PositionInComposedTree(four, 1), selectionInComposedTree.extent());
-    EXPECT_EQ(PositionInComposedTree(three, 0), selectionInComposedTree.start());
-    EXPECT_EQ(PositionInComposedTree(four, 4), selectionInComposedTree.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 = VisibleSelection(createVisiblePosition(Position(five, 1)));
     selection.expandUsingGranularity(WordGranularity);
-    selectionInComposedTree = VisibleSelectionInComposedTree(createVisiblePosition(PositionInComposedTree(five, 1)));
-    selectionInComposedTree.expandUsingGranularity(WordGranularity);
+    selectionInFlatTree = VisibleSelectionInFlatTree(createVisiblePosition(PositionInFlatTree(five, 1)));
+    selectionInFlatTree.expandUsingGranularity(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(PositionInComposedTree(five, 1), selectionInComposedTree.base());
-    EXPECT_EQ(PositionInComposedTree(five, 1), selectionInComposedTree.extent());
-    EXPECT_EQ(PositionInComposedTree(one, 0), selectionInComposedTree.start());
-    EXPECT_EQ(PositionInComposedTree(five, 5), selectionInComposedTree.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());
 }
 
 TEST_F(VisibleSelectionTest, Initialisation)
 {
     setBodyContent(LOREM_IPSUM);
 
     VisibleSelection selection;
-    VisibleSelectionInComposedTree selectionInComposedTree;
+    VisibleSelectionInFlatTree selectionInFlatTree;
     setSelection(selection, 0);
-    setSelection(selectionInComposedTree, 0);
+    setSelection(selectionInFlatTree, 0);
 
     EXPECT_FALSE(selection.isNone());
-    EXPECT_FALSE(selectionInComposedTree.isNone());
+    EXPECT_FALSE(selectionInFlatTree.isNone());
     EXPECT_TRUE(selection.isCaret());
-    EXPECT_TRUE(selectionInComposedTree.isCaret());
+    EXPECT_TRUE(selectionInFlatTree.isCaret());
 
     RefPtrWillBeRawPtr<Range> range = firstRangeOf(selection);
     EXPECT_EQ(0, range->startOffset());
     EXPECT_EQ(0, range->endOffset());
     EXPECT_EQ("", range->text());
-    testComposedTreePositionsToEqualToDOMTreePositions(selection, selectionInComposedTree);
+    testFlatTreePositionsToEqualToDOMTreePositions(selection, selectionInFlatTree);
 }
 
 TEST_F(VisibleSelectionTest, ShadowCrossing)
 {
     const char* bodyContent = "<p id='host'>00<b id='one'>11</b><b id='two'>22</b>33</p>";
     const char* shadowContent = "<a><span id='s4'>44</span><content select=#two></content><span id='s5'>55</span><content select=#one></content><span id='s6'>66</span></a>";
     setBodyContent(bodyContent);
     RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
 
     RefPtrWillBeRawPtr<Element> body = document().body();
     RefPtrWillBeRawPtr<Element> host = body->querySelector("#host", ASSERT_NO_EXCEPTION);
     RefPtrWillBeRawPtr<Element> one = body->querySelector("#one", ASSERT_NO_EXCEPTION);
     RefPtrWillBeRawPtr<Element> six = shadowRoot->querySelector("#s6", ASSERT_NO_EXCEPTION);
 
     VisibleSelection selection(Position::firstPositionInNode(one.get()), Position::lastPositionInNode(shadowRoot.get()));
-    VisibleSelectionInComposedTree selectionInComposedTree(PositionInComposedTree::firstPositionInNode(one.get()), PositionInComposedTree::lastPositionInNode(host.get()));
+    VisibleSelectionInFlatTree selectionInFlatTree(PositionInFlatTree::firstPositionInNode(one.get()), PositionInFlatTree::lastPositionInNode(host.get()));
 
     EXPECT_EQ(Position(host.get(), PositionAnchorType::BeforeAnchor), selection.start());
     EXPECT_EQ(Position(one->firstChild(), 0), selection.end());
-    EXPECT_EQ(PositionInComposedTree(one->firstChild(), 0), selectionInComposedTree.start());
-    EXPECT_EQ(PositionInComposedTree(six->firstChild(), 2), selectionInComposedTree.end());
+    EXPECT_EQ(PositionInFlatTree(one->firstChild(), 0), selectionInFlatTree.start());
+    EXPECT_EQ(PositionInFlatTree(six->firstChild(), 2), selectionInFlatTree.end());
 }
 
 TEST_F(VisibleSelectionTest, ShadowV0DistributedNodes)
 {
     const char* bodyContent = "<p id='host'>00<b id='one'>11</b><b id='two'>22</b>33</p>";
     const char* shadowContent = "<a><span id='s4'>44</span><content select=#two></content><span id='s5'>55</span><content select=#one></content><span id='s6'>66</span></a>";
     setBodyContent(bodyContent);
     RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
 
     RefPtrWillBeRawPtr<Element> body = document().body();
     RefPtrWillBeRawPtr<Element> one = body->querySelector("#one", ASSERT_NO_EXCEPTION);
     RefPtrWillBeRawPtr<Element> two = body->querySelector("#two", ASSERT_NO_EXCEPTION);
     RefPtrWillBeRawPtr<Element> five = shadowRoot->querySelector("#s5", ASSERT_NO_EXCEPTION);
 
     VisibleSelection selection(Position::firstPositionInNode(one.get()), Position::lastPositionInNode(two.get()));
-    VisibleSelectionInComposedTree selectionInComposedTree(PositionInComposedTree::firstPositionInNode(one.get()), PositionInComposedTree::lastPositionInNode(two.get()));
+    VisibleSelectionInFlatTree selectionInFlatTree(PositionInFlatTree::firstPositionInNode(one.get()), PositionInFlatTree::lastPositionInNode(two.get()));
 
     EXPECT_EQ(Position(one->firstChild(), 0), selection.start());
     EXPECT_EQ(Position(two->firstChild(), 2), selection.end());
-    EXPECT_EQ(PositionInComposedTree(five->firstChild(), 0), selectionInComposedTree.start());
-    EXPECT_EQ(PositionInComposedTree(five->firstChild(), 2), selectionInComposedTree.end());
+    EXPECT_EQ(PositionInFlatTree(five->firstChild(), 0), selectionInFlatTree.start());
+    EXPECT_EQ(PositionInFlatTree(five->firstChild(), 2), selectionInFlatTree.end());
 }
 
 TEST_F(VisibleSelectionTest, ShadowNested)
 {
     const char* bodyContent = "<p id='host'>00<b id='one'>11</b><b id='two'>22</b>33</p>";
     const char* shadowContent = "<a><span id='s4'>44</span><content select=#two></content><span id='s5'>55</span><content select=#one></content><span id='s6'>66</span></a>";
     const char* shadowContent2 = "<span id='s7'>77</span><content></content><span id='s8'>88</span>";
     setBodyContent(bodyContent);
     RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
     RefPtrWillBeRawPtr<ShadowRoot> shadowRoot2 = createShadowRootForElementWithIDAndSetInnerHTML(*shadowRoot, "s5", shadowContent2);
 
-    // Composed tree is something like below:
+    // Flat tree is something like below:
     //  <p id="host">
     //    <span id="s4">44</span>
     //    <b id="two">22</b>
     //    <span id="s5"><span id="s7">77>55</span id="s8">88</span>
     //    <b id="one">11</b>
     //    <span id="s6">66</span>
     //  </p>
     RefPtrWillBeRawPtr<Element> body = document().body();
     RefPtrWillBeRawPtr<Element> host = body->querySelector("#host", ASSERT_NO_EXCEPTION);
     RefPtrWillBeRawPtr<Element> one = body->querySelector("#one", ASSERT_NO_EXCEPTION);
     RefPtrWillBeRawPtr<Element> eight = shadowRoot2->querySelector("#s8", ASSERT_NO_EXCEPTION);
 
     VisibleSelection selection(Position::firstPositionInNode(one.get()), Position::lastPositionInNode(shadowRoot2.get()));
-    VisibleSelectionInComposedTree selectionInComposedTree(PositionInComposedTree::firstPositionInNode(one.get()), PositionInComposedTree::afterNode(eight.get()));
+    VisibleSelectionInFlatTree selectionInFlatTree(PositionInFlatTree::firstPositionInNode(one.get()), PositionInFlatTree::afterNode(eight.get()));
 
     EXPECT_EQ(Position(host.get(), PositionAnchorType::BeforeAnchor), selection.start());
     EXPECT_EQ(Position(one->firstChild(), 0), selection.end());
-    EXPECT_EQ(PositionInComposedTree(eight->firstChild(), 2), selectionInComposedTree.start());
-    EXPECT_EQ(PositionInComposedTree(eight->firstChild(), 2), selectionInComposedTree.end());
+    EXPECT_EQ(PositionInFlatTree(eight->firstChild(), 2), selectionInFlatTree.start());
+    EXPECT_EQ(PositionInFlatTree(eight->firstChild(), 2), selectionInFlatTree.end());
 }
 
 TEST_F(VisibleSelectionTest, WordGranularity)
 {
     setBodyContent(LOREM_IPSUM);
 
     VisibleSelection selection;
-    VisibleSelectionInComposedTree selectionInComposedTree;
+    VisibleSelectionInFlatTree selectionInFlatTree;
 
     // Beginning of a word.
     {
         setSelection(selection, 0);
-        setSelection(selectionInComposedTree, 0);
+        setSelection(selectionInFlatTree, 0);
         selection.expandUsingGranularity(WordGranularity);
-        selectionInComposedTree.expandUsingGranularity(WordGranularity);
+        selectionInFlatTree.expandUsingGranularity(WordGranularity);
 
         RefPtrWillBeRawPtr<Range> range = firstRangeOf(selection);
         EXPECT_EQ(0, range->startOffset());
         EXPECT_EQ(5, range->endOffset());
         EXPECT_EQ("Lorem", range->text());
-        testComposedTreePositionsToEqualToDOMTreePositions(selection, selectionInComposedTree);
+        testFlatTreePositionsToEqualToDOMTreePositions(selection, selectionInFlatTree);
 
     }
 
     // Middle of a word.
     {
         setSelection(selection, 8);
-        setSelection(selectionInComposedTree, 8);
+        setSelection(selectionInFlatTree, 8);
         selection.expandUsingGranularity(WordGranularity);
-        selectionInComposedTree.expandUsingGranularity(WordGranularity);
+        selectionInFlatTree.expandUsingGranularity(WordGranularity);
 
         RefPtrWillBeRawPtr<Range> range = firstRangeOf(selection);
         EXPECT_EQ(6, range->startOffset());
         EXPECT_EQ(11, range->endOffset());
         EXPECT_EQ("ipsum", range->text());
-        testComposedTreePositionsToEqualToDOMTreePositions(selection, selectionInComposedTree);
+        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(selectionInComposedTree, 5);
+        setSelection(selectionInFlatTree, 5);
         selection.expandUsingGranularity(WordGranularity);
-        selectionInComposedTree.expandUsingGranularity(WordGranularity);
+        selectionInFlatTree.expandUsingGranularity(WordGranularity);
 
         RefPtrWillBeRawPtr<Range> range = firstRangeOf(selection);
         EXPECT_EQ(5, range->startOffset());
         EXPECT_EQ(6, range->endOffset());
         EXPECT_EQ(" ", range->text());
-        testComposedTreePositionsToEqualToDOMTreePositions(selection, selectionInComposedTree);
+        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(selectionInComposedTree, 26);
+        setSelection(selectionInFlatTree, 26);
         selection.expandUsingGranularity(WordGranularity);
-        selectionInComposedTree.expandUsingGranularity(WordGranularity);
+        selectionInFlatTree.expandUsingGranularity(WordGranularity);
 
         RefPtrWillBeRawPtr<Range> range = firstRangeOf(selection);
         EXPECT_EQ(26, range->startOffset());
         EXPECT_EQ(27, range->endOffset());
         EXPECT_EQ(",", range->text());
-        testComposedTreePositionsToEqualToDOMTreePositions(selection, selectionInComposedTree);
+        testFlatTreePositionsToEqualToDOMTreePositions(selection, selectionInFlatTree);
     }
 
     // After comma.
     {
         setSelection(selection, 27);
-        setSelection(selectionInComposedTree, 27);
+        setSelection(selectionInFlatTree, 27);
         selection.expandUsingGranularity(WordGranularity);
-        selectionInComposedTree.expandUsingGranularity(WordGranularity);
+        selectionInFlatTree.expandUsingGranularity(WordGranularity);
 
         RefPtrWillBeRawPtr<Range> range = firstRangeOf(selection);
         EXPECT_EQ(27, range->startOffset());
         EXPECT_EQ(28, range->endOffset());
         EXPECT_EQ(" ", range->text());
-        testComposedTreePositionsToEqualToDOMTreePositions(selection, selectionInComposedTree);
+        testFlatTreePositionsToEqualToDOMTreePositions(selection, selectionInFlatTree);
     }
 
     // When selecting part of a word.
     {
         setSelection(selection, 0, 1);
-        setSelection(selectionInComposedTree, 0, 1);
+        setSelection(selectionInFlatTree, 0, 1);
         selection.expandUsingGranularity(WordGranularity);
-        selectionInComposedTree.expandUsingGranularity(WordGranularity);
+        selectionInFlatTree.expandUsingGranularity(WordGranularity);
 
         RefPtrWillBeRawPtr<Range> range = firstRangeOf(selection);
         EXPECT_EQ(0, range->startOffset());
         EXPECT_EQ(5, range->endOffset());
         EXPECT_EQ("Lorem", range->text());
-        testComposedTreePositionsToEqualToDOMTreePositions(selection, selectionInComposedTree);
+        testFlatTreePositionsToEqualToDOMTreePositions(selection, selectionInFlatTree);
     }
 
     // When selecting part of two words.
     {
         setSelection(selection, 2, 8);
-        setSelection(selectionInComposedTree, 2, 8);
+        setSelection(selectionInFlatTree, 2, 8);
         selection.expandUsingGranularity(WordGranularity);
-        selectionInComposedTree.expandUsingGranularity(WordGranularity);
+        selectionInFlatTree.expandUsingGranularity(WordGranularity);
 
         RefPtrWillBeRawPtr<Range> range = firstRangeOf(selection);
         EXPECT_EQ(0, range->startOffset());
         EXPECT_EQ(11, range->endOffset());
         EXPECT_EQ("Lorem ipsum", range->text());
-        testComposedTreePositionsToEqualToDOMTreePositions(selection, selectionInComposedTree);
+        testFlatTreePositionsToEqualToDOMTreePositions(selection, selectionInFlatTree);
     }
 }
 
 } // namespace blink