Rename ComposedTree to FlatTree

third_party/WebKit/Source/core/editing/FrameSelectionTest.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/FrameSelection.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Text.h"
@@ skipping 12 matching lines @@
 #include "wtf/RefPtr.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
 
 class FrameSelectionTest : public EditingTestBase {
 protected:
     void setSelection(const VisibleSelection&);
     FrameSelection& selection() const;
     const VisibleSelection& visibleSelectionInDOMTree() const { return selection().selection(); }
-    const VisibleSelectionInComposedTree& visibleSelectionInComposedTree() const { return selection().selectionInComposedTree(); }
+    const VisibleSelectionInFlatTree& visibleSelectionInFlatTree() const { return selection().selectionInFlatTree(); }
 
     PassRefPtrWillBeRawPtr<Text> appendTextNode(const String& data);
     int layoutCount() const { return dummyPageHolder().frameView().layoutCount(); }
 
 private:
     RefPtrWillBePersistent<Text> m_textNode;
 };
 
 void FrameSelectionTest::setSelection(const VisibleSelection& newSelection)
 {
@@ skipping 139 matching lines @@
     const char* shadowContent = "<span id=bottom>bottom</span>";
     setBodyContent(bodyContent);
     RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = setShadowContent(shadowContent, "host");
     updateLayoutAndStyleForPainting();
 
     Node* top = document().getElementById("top")->firstChild();
     Node* bottom = shadowRoot->getElementById("bottom")->firstChild();
     Node* host = document().getElementById("host");
 
     // top to bottom
-    selection().setNonDirectionalSelectionIfNeeded(VisibleSelectionInComposedTree(PositionInComposedTree(top, 1), PositionInComposedTree(bottom, 3)), CharacterGranularity);
+    selection().setNonDirectionalSelectionIfNeeded(VisibleSelectionInFlatTree(PositionInFlatTree(top, 1), PositionInFlatTree(bottom, 3)), CharacterGranularity);
     EXPECT_EQ(Position(top, 1), visibleSelectionInDOMTree().base());
     EXPECT_EQ(Position::beforeNode(host), visibleSelectionInDOMTree().extent());
     EXPECT_EQ(Position(top, 1), visibleSelectionInDOMTree().start());
     EXPECT_EQ(Position(top, 3), visibleSelectionInDOMTree().end());
 
-    EXPECT_EQ(PositionInComposedTree(top, 1), visibleSelectionInComposedTree().base());
-    EXPECT_EQ(PositionInComposedTree(bottom, 3), visibleSelectionInComposedTree().extent());
-    EXPECT_EQ(PositionInComposedTree(top, 1), visibleSelectionInComposedTree().start());
-    EXPECT_EQ(PositionInComposedTree(bottom, 3), visibleSelectionInComposedTree().end());
+    EXPECT_EQ(PositionInFlatTree(top, 1), visibleSelectionInFlatTree().base());
+    EXPECT_EQ(PositionInFlatTree(bottom, 3), visibleSelectionInFlatTree().extent());
+    EXPECT_EQ(PositionInFlatTree(top, 1), visibleSelectionInFlatTree().start());
+    EXPECT_EQ(PositionInFlatTree(bottom, 3), visibleSelectionInFlatTree().end());
 
     // bottom to top
-    selection().setNonDirectionalSelectionIfNeeded(VisibleSelectionInComposedTree(PositionInComposedTree(bottom, 3), PositionInComposedTree(top, 1)), CharacterGranularity);
+    selection().setNonDirectionalSelectionIfNeeded(VisibleSelectionInFlatTree(PositionInFlatTree(bottom, 3), PositionInFlatTree(top, 1)), CharacterGranularity);
     EXPECT_EQ(Position(bottom, 3), visibleSelectionInDOMTree().base());
     EXPECT_EQ(Position::beforeNode(bottom->parentNode()), visibleSelectionInDOMTree().extent());
     EXPECT_EQ(Position(bottom, 0), visibleSelectionInDOMTree().start());
     EXPECT_EQ(Position(bottom, 3), visibleSelectionInDOMTree().end());
 
-    EXPECT_EQ(PositionInComposedTree(bottom, 3), visibleSelectionInComposedTree().base());
-    EXPECT_EQ(PositionInComposedTree(top, 1), visibleSelectionInComposedTree().extent());
-    EXPECT_EQ(PositionInComposedTree(top, 1), visibleSelectionInComposedTree().start());
-    EXPECT_EQ(PositionInComposedTree(bottom, 3), visibleSelectionInComposedTree().end());
+    EXPECT_EQ(PositionInFlatTree(bottom, 3), visibleSelectionInFlatTree().base());
+    EXPECT_EQ(PositionInFlatTree(top, 1), visibleSelectionInFlatTree().extent());
+    EXPECT_EQ(PositionInFlatTree(top, 1), visibleSelectionInFlatTree().start());
+    EXPECT_EQ(PositionInFlatTree(bottom, 3), visibleSelectionInFlatTree().end());
 }
 
 TEST_F(FrameSelectionTest, SelectAllWithUnselectableRoot)
 {
     RefPtrWillBeRawPtr<Element> select = document().createElement("select", ASSERT_NO_EXCEPTION);
     document().replaceChild(select.get(), document().documentElement());
     selection().selectAll();
     EXPECT_TRUE(selection().isNone()) << "Nothing should be selected if the content of the documentElement is not selctable.";
 }
 
 } // namespace blink