Make non-null VisibleSelections creatable only by createVisibleSelection[Deprecated]

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 47 matching lines @@
     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 = VisibleSelection(createVisiblePosition(Position(one, 1)));
+    selection = createVisibleSelectionDeprecated(createVisiblePosition(Position(one, 1)));
     selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree = VisibleSelectionInFlatTree(createVisiblePosition(PositionInFlatTree(one, 1)));
+    selectionInFlatTree = createVisibleSelectionDeprecated(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(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 = createVisibleSelectionDeprecated(createVisiblePosition(Position(two, 1)));
     selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree = VisibleSelectionInFlatTree(createVisiblePosition(PositionInFlatTree(two, 1)));
+    selectionInFlatTree = createVisibleSelectionDeprecated(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(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 = createVisibleSelectionDeprecated(createVisiblePosition(Position(three, 1)));
     selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree = VisibleSelectionInFlatTree(createVisiblePosition(PositionInFlatTree(three, 1)));
+    selectionInFlatTree = createVisibleSelectionDeprecated(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(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 = createVisibleSelectionDeprecated(createVisiblePosition(Position(four, 1)));
     selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree = VisibleSelectionInFlatTree(createVisiblePosition(PositionInFlatTree(four, 1)));
+    selectionInFlatTree = createVisibleSelectionDeprecated(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(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 = createVisibleSelectionDeprecated(createVisiblePosition(Position(five, 1)));
     selection.expandUsingGranularity(WordGranularity);
-    selectionInFlatTree = VisibleSelectionInFlatTree(createVisiblePosition(PositionInFlatTree(five, 1)));
+    selectionInFlatTree = createVisibleSelectionDeprecated(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(PositionInFlatTree(five, 1), selectionInFlatTree.base());
     EXPECT_EQ(PositionInFlatTree(five, 1), selectionInFlatTree.extent());
     EXPECT_EQ(PositionInFlatTree(one, 0), selectionInFlatTree.start());
@@ skipping 26 matching lines @@
     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);
     ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
     Element* body = document().body();
     Element* host = body->querySelector("#host");
     Element* one = body->querySelector("#one");
     Element* six = shadowRoot->querySelector("#s6");
 
-    VisibleSelection selection(Position::firstPositionInNode(one), Position::lastPositionInNode(shadowRoot));
-    VisibleSelectionInFlatTree selectionInFlatTree(PositionInFlatTree::firstPositionInNode(one), PositionInFlatTree::lastPositionInNode(host));
+    VisibleSelection selection = createVisibleSelectionDeprecated(Position::firstPositionInNode(one), Position::lastPositionInNode(shadowRoot));
+    VisibleSelectionInFlatTree selectionInFlatTree = createVisibleSelectionDeprecated(PositionInFlatTree::firstPositionInNode(one), PositionInFlatTree::lastPositionInNode(host));
 
     EXPECT_EQ(Position(host, PositionAnchorType::BeforeAnchor), selection.start());
     EXPECT_EQ(Position(one->firstChild(), 0), selection.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);
     ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
     Element* body = document().body();
     Element* one = body->querySelector("#one");
     Element* two = body->querySelector("#two");
     Element* five = shadowRoot->querySelector("#s5");
 
-    VisibleSelection selection(Position::firstPositionInNode(one), Position::lastPositionInNode(two));
-    VisibleSelectionInFlatTree selectionInFlatTree(PositionInFlatTree::firstPositionInNode(one), PositionInFlatTree::lastPositionInNode(two));
+    VisibleSelection selection = createVisibleSelectionDeprecated(Position::firstPositionInNode(one), Position::lastPositionInNode(two));
+    VisibleSelectionInFlatTree selectionInFlatTree = createVisibleSelectionDeprecated(PositionInFlatTree::firstPositionInNode(one), PositionInFlatTree::lastPositionInNode(two));
 
     EXPECT_EQ(Position(one->firstChild(), 0), selection.start());
     EXPECT_EQ(Position(two->firstChild(), 2), selection.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);
     ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
     ShadowRoot* shadowRoot2 = createShadowRootForElementWithIDAndSetInnerHTML(*shadowRoot, "s5", shadowContent2);
 
     // 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>
     Element* body = document().body();
     Element* host = body->querySelector("#host");
     Element* one = body->querySelector("#one");
     Element* eight = shadowRoot2->querySelector("#s8");
 
-    VisibleSelection selection(Position::firstPositionInNode(one), Position::lastPositionInNode(shadowRoot2));
-    VisibleSelectionInFlatTree selectionInFlatTree(PositionInFlatTree::firstPositionInNode(one), PositionInFlatTree::afterNode(eight));
+    VisibleSelection selection = createVisibleSelectionDeprecated(Position::firstPositionInNode(one), Position::lastPositionInNode(shadowRoot2));
+    VisibleSelectionInFlatTree selectionInFlatTree = createVisibleSelectionDeprecated(PositionInFlatTree::firstPositionInNode(one), PositionInFlatTree::afterNode(eight));
 
     EXPECT_EQ(Position(host, PositionAnchorType::BeforeAnchor), selection.start());
     EXPECT_EQ(Position(one->firstChild(), 0), selection.end());
     EXPECT_EQ(PositionInFlatTree(eight->firstChild(), 2), selectionInFlatTree.start());
     EXPECT_EQ(PositionInFlatTree(eight->firstChild(), 2), selectionInFlatTree.end());
 }
 
 TEST_F(VisibleSelectionTest, WordGranularity)
 {
     setBodyContent(LOREM_IPSUM);
@@ skipping 108 matching lines @@
 
 // This is for crbug.com/627783, simulating restoring selection
 // in undo stack.
 TEST_F(VisibleSelectionTest, validatePositionsIfNeededWithShadowHost)
 {
     setBodyContent("<div id=host></div><div id=sample>foo</div>");
     setShadowContent("<content>", "host");
     Element* sample = document().getElementById("sample");
 
     // Simulates saving selection in undo stack.
-    VisibleSelection selection(Position(sample->firstChild(), 0));
+    VisibleSelection selection = createVisibleSelectionDeprecated(Position(sample->firstChild(), 0));
     EXPECT_EQ(Position(sample->firstChild(), 0), selection.start());
 
     // Simulates modifying DOM tree to invalidate distribution.
     Element* host = document().getElementById("host");
     host->appendChild(sample);
 
     // Simulates to restore selection from undo stack.
     selection.validatePositionsIfNeeded();
     EXPECT_EQ(Position(sample->firstChild(), 0), selection.start());
 
     VisibleSelectionInFlatTree selectionInFlatTree;
     SelectionAdjuster::adjustSelectionInFlatTree(&selectionInFlatTree, selection);
     EXPECT_EQ(PositionInFlatTree(sample->firstChild(), 0), selectionInFlatTree.start());
 }
 
 } // namespace blink