Prune createVisiblePositionDeprecated from unit tests

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

 // Copyright 2015 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/VisibleUnits.h"
 
 #include "core/dom/Text.h"
 #include "core/editing/EditingTestBase.h"
 #include "core/editing/VisiblePosition.h"
 #include "core/html/HTMLTextFormControlElement.h"
 #include "core/layout/LayoutTextFragment.h"
 #include "core/layout/line/InlineTextBox.h"
 #include <ostream> // NOLINT
 
 namespace blink {
 
 namespace {
 
 PositionWithAffinity positionWithAffinityInDOMTree(Node& anchor, int offset, TextAffinity affinity = TextAffinity::Downstream)
 {
     return PositionWithAffinity(canonicalPositionOf(Position(&anchor, offset)), affinity);
 }
 
 VisiblePosition createVisiblePositionInDOMTree(Node& anchor, int offset, TextAffinity affinity = TextAffinity::Downstream)
 {
-    return createVisiblePositionDeprecated(Position(&anchor, offset), affinity);
+    return createVisiblePosition(Position(&anchor, offset), affinity);
 }
 
 PositionInFlatTreeWithAffinity positionWithAffinityInFlatTree(Node& anchor, int offset, TextAffinity affinity = TextAffinity::Downstream)
 {
     return PositionInFlatTreeWithAffinity(canonicalPositionOf(PositionInFlatTree(&anchor, offset)), affinity);
 }
 
 VisiblePositionInFlatTree createVisiblePositionInFlatTree(Node& anchor, int offset, TextAffinity affinity = TextAffinity::Downstream)
 {
-    return createVisiblePositionDeprecated(PositionInFlatTree(&anchor, offset), affinity);
+    return createVisiblePosition(PositionInFlatTree(&anchor, offset), affinity);
 }
 
 } // namespace
 
 std::ostream& operator<<(std::ostream& ostream, const InlineBoxPosition& inlineBoxPosition)
 {
     if (!inlineBoxPosition.inlineBox)
         return ostream << "null";
     return ostream << inlineBoxPosition.inlineBox->getLineLayoutItem().node() << "@" << inlineBoxPosition.offsetInBox;
 }
 
 class VisibleUnitsTest : public EditingTestBase {
 };
 
 TEST_F(VisibleUnitsTest, absoluteCaretBoundsOf)
 {
     const char* bodyContent = "<p id='host'><b id='one'>11</b><b id='two'>22</b></p>";
     const char* shadowContent = "<div><content select=#two></content><content select=#one></content></div>";
     setBodyContent(bodyContent);
     setShadowContent(shadowContent, "host");
 
     Element* body = document().body();
     Element* one = body->querySelector("#one");
 
-    IntRect boundsInDOMTree = absoluteCaretBoundsOf(createVisiblePositionDeprecated(Position(one, 0)));
-    IntRect boundsInFlatTree = absoluteCaretBoundsOf(createVisiblePositionDeprecated(PositionInFlatTree(one, 0)));
+    IntRect boundsInDOMTree = absoluteCaretBoundsOf(createVisiblePosition(Position(one, 0)));
+    IntRect boundsInFlatTree = absoluteCaretBoundsOf(createVisiblePosition(PositionInFlatTree(one, 0)));
 
     EXPECT_FALSE(boundsInDOMTree.isEmpty());
     EXPECT_EQ(boundsInDOMTree, boundsInFlatTree);
 }
 
 TEST_F(VisibleUnitsTest, associatedLayoutObjectOfFirstLetterPunctuations)
 {
     const char* bodyContent = "<style>p:first-letter {color:red;}</style><p id=sample>(a)bc</p>";
     setBodyContent(bodyContent);
 
@@ skipping 685 matching lines @@
     const char* shadowContent = "<b id=four>4444</b><content select=#two></content><content select=#one></content><b id=five>55555</b>";
     setBodyContent(bodyContent);
     ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
     Element* one = document().getElementById("one");
     Element* two = document().getElementById("two");
     Element* three = document().getElementById("three");
     Element* four = shadowRoot->getElementById("four");
     Element* five = shadowRoot->getElementById("five");
 
-    EXPECT_EQ(Position(two->firstChild(), 1), leftPositionOf(createVisiblePositionDeprecated(Position(one, 0))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(two->firstChild(), 1), leftPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(one, 0))).deepEquivalent());
+    EXPECT_EQ(Position(two->firstChild(), 1), leftPositionOf(createVisiblePosition(Position(one, 0))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(two->firstChild(), 1), leftPositionOf(createVisiblePosition(PositionInFlatTree(one, 0))).deepEquivalent());
 
-    EXPECT_EQ(Position(one->firstChild(), 0), leftPositionOf(createVisiblePositionDeprecated(Position(two, 0))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(four->firstChild(), 3), leftPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(two, 0))).deepEquivalent());
+    EXPECT_EQ(Position(one->firstChild(), 0), leftPositionOf(createVisiblePosition(Position(two, 0))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(four->firstChild(), 3), leftPositionOf(createVisiblePosition(PositionInFlatTree(two, 0))).deepEquivalent());
 
-    EXPECT_EQ(Position(two->firstChild(), 2), leftPositionOf(createVisiblePositionDeprecated(Position(three, 0))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(five->firstChild(), 5), leftPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(three, 0))).deepEquivalent());
+    EXPECT_EQ(Position(two->firstChild(), 2), leftPositionOf(createVisiblePosition(Position(three, 0))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(five->firstChild(), 5), leftPositionOf(createVisiblePosition(PositionInFlatTree(three, 0))).deepEquivalent());
 }
 
 TEST_F(VisibleUnitsTest, localCaretRectOfPosition)
 {
     const char* bodyContent = "<p id='host'><b id='one'>1</b></p><b id='two'>22</b>";
     const char* shadowContent = "<b id='two'>22</b><content select=#one></content><b id='three'>333</b>";
     setBodyContent(bodyContent);
     setShadowContent(shadowContent, "host");
 
     Element* one = document().getElementById("one");
@@ skipping 198 matching lines @@
     setBodyContent(bodyContent);
     ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
     Element* zero = document().getElementById("zero");
     Element* one = document().getElementById("one");
     Element* two = document().getElementById("two");
     Element* three = document().getElementById("three");
     Element* four = shadowRoot->getElementById("four");
     Element* five = shadowRoot->getElementById("five");
 
-    EXPECT_EQ(Position(one->firstChild(), 0), nextPositionOf(createVisiblePositionDeprecated(Position(zero, 1))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(four->firstChild(), 0), nextPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(zero, 1))).deepEquivalent());
+    EXPECT_EQ(Position(one->firstChild(), 0), nextPositionOf(createVisiblePosition(Position(zero, 1))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(four->firstChild(), 0), nextPositionOf(createVisiblePosition(PositionInFlatTree(zero, 1))).deepEquivalent());
 
-    EXPECT_EQ(Position(one->firstChild(), 1), nextPositionOf(createVisiblePositionDeprecated(Position(one, 0))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(one->firstChild(), 1), nextPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(one, 0))).deepEquivalent());
+    EXPECT_EQ(Position(one->firstChild(), 1), nextPositionOf(createVisiblePosition(Position(one, 0))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(one->firstChild(), 1), nextPositionOf(createVisiblePosition(PositionInFlatTree(one, 0))).deepEquivalent());
 
-    EXPECT_EQ(Position(two->firstChild(), 1), nextPositionOf(createVisiblePositionDeprecated(Position(one, 1))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(five->firstChild(), 1), nextPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(one, 1))).deepEquivalent());
+    EXPECT_EQ(Position(two->firstChild(), 1), nextPositionOf(createVisiblePosition(Position(one, 1))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(five->firstChild(), 1), nextPositionOf(createVisiblePosition(PositionInFlatTree(one, 1))).deepEquivalent());
 
-    EXPECT_EQ(Position(three->firstChild(), 0), nextPositionOf(createVisiblePositionDeprecated(Position(two, 2))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(one->firstChild(), 1), nextPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(two, 2))).deepEquivalent());
+    EXPECT_EQ(Position(three->firstChild(), 0), nextPositionOf(createVisiblePosition(Position(two, 2))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(one->firstChild(), 1), nextPositionOf(createVisiblePosition(PositionInFlatTree(two, 2))).deepEquivalent());
 }
 
 TEST_F(VisibleUnitsTest, previousPositionOf)
 {
     const char* bodyContent = "<b id=zero>0</b><p id=host><b id=one>1</b><b id=two>22</b></p><b id=three>333</b>";
     const char* shadowContent = "<b id=four>4444</b><content select=#two></content><content select=#one></content><b id=five>55555</b>";
     setBodyContent(bodyContent);
     ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
     Node* zero = document().getElementById("zero")->firstChild();
     Node* one = document().getElementById("one")->firstChild();
     Node* two = document().getElementById("two")->firstChild();
     Node* three = document().getElementById("three")->firstChild();
     Node* four = shadowRoot->getElementById("four")->firstChild();
     Node* five = shadowRoot->getElementById("five")->firstChild();
 
-    EXPECT_EQ(Position(zero, 0), previousPositionOf(createVisiblePositionDeprecated(Position(zero, 1))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(zero, 0), previousPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(zero, 1))).deepEquivalent());
+    EXPECT_EQ(Position(zero, 0), previousPositionOf(createVisiblePosition(Position(zero, 1))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(zero, 0), previousPositionOf(createVisiblePosition(PositionInFlatTree(zero, 1))).deepEquivalent());
 
-    EXPECT_EQ(Position(zero, 1), previousPositionOf(createVisiblePositionDeprecated(Position(one, 0))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(two, 1), previousPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(one, 0))).deepEquivalent());
+    EXPECT_EQ(Position(zero, 1), previousPositionOf(createVisiblePosition(Position(one, 0))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(two, 1), previousPositionOf(createVisiblePosition(PositionInFlatTree(one, 0))).deepEquivalent());
 
-    EXPECT_EQ(Position(one, 0), previousPositionOf(createVisiblePositionDeprecated(Position(one, 1))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(two, 2), previousPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(one, 1))).deepEquivalent());
+    EXPECT_EQ(Position(one, 0), previousPositionOf(createVisiblePosition(Position(one, 1))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(two, 2), previousPositionOf(createVisiblePosition(PositionInFlatTree(one, 1))).deepEquivalent());
 
-    EXPECT_EQ(Position(one, 0), previousPositionOf(createVisiblePositionDeprecated(Position(two, 0))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(four, 3), previousPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(two, 0))).deepEquivalent());
+    EXPECT_EQ(Position(one, 0), previousPositionOf(createVisiblePosition(Position(two, 0))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(four, 3), previousPositionOf(createVisiblePosition(PositionInFlatTree(two, 0))).deepEquivalent());
 
     // DOM tree to shadow tree
-    EXPECT_EQ(Position(two, 2), previousPositionOf(createVisiblePositionDeprecated(Position(three, 0))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(five, 5), previousPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(three, 0))).deepEquivalent());
+    EXPECT_EQ(Position(two, 2), previousPositionOf(createVisiblePosition(Position(three, 0))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(five, 5), previousPositionOf(createVisiblePosition(PositionInFlatTree(three, 0))).deepEquivalent());
 
     // Shadow tree to DOM tree
-    EXPECT_EQ(Position(), previousPositionOf(createVisiblePositionDeprecated(Position(four, 0))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(zero, 1), previousPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(four, 0))).deepEquivalent());
+    EXPECT_EQ(Position(), previousPositionOf(createVisiblePosition(Position(four, 0))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(zero, 1), previousPositionOf(createVisiblePosition(PositionInFlatTree(four, 0))).deepEquivalent());
 
     // Note: Canonicalization maps (five, 0) to (four, 4) in DOM tree and
     // (one, 1) in flat tree.
-    EXPECT_EQ(Position(four, 4), previousPositionOf(createVisiblePositionDeprecated(Position(five, 1))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(one, 1), previousPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(five, 1))).deepEquivalent());
+    EXPECT_EQ(Position(four, 4), previousPositionOf(createVisiblePosition(Position(five, 1))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(one, 1), previousPositionOf(createVisiblePosition(PositionInFlatTree(five, 1))).deepEquivalent());
 }
 
 TEST_F(VisibleUnitsTest, previousPositionOfOneCharPerLine)
 {
     const char* bodyContent = "<div id=sample style='font-size: 500px'>A&#x714a;&#xfa67;</div>";
     setBodyContent(bodyContent);
 
     Node* sample = document().getElementById("sample")->firstChild();
 
     // In case of each line has one character, VisiblePosition are:
     // [C,Dn]   [C,Up]  [B, Dn]   [B, Up]
     //  A        A       A         A|
     //  B        B|     |B         B
     // |C        C       C         C
-    EXPECT_EQ(PositionWithAffinity(Position(sample, 1)), previousPositionOf(createVisiblePositionDeprecated(Position(sample, 2))).toPositionWithAffinity());
-    EXPECT_EQ(PositionWithAffinity(Position(sample, 1)), previousPositionOf(createVisiblePositionDeprecated(Position(sample, 2), TextAffinity::Upstream)).toPositionWithAffinity());
+    EXPECT_EQ(PositionWithAffinity(Position(sample, 1)), previousPositionOf(createVisiblePosition(Position(sample, 2))).toPositionWithAffinity());
+    EXPECT_EQ(PositionWithAffinity(Position(sample, 1)), previousPositionOf(createVisiblePosition(Position(sample, 2), TextAffinity::Upstream)).toPositionWithAffinity());
 }
 
 TEST_F(VisibleUnitsTest, previousPositionOfNoPreviousPosition)
 {
     setBodyContent(
         "<span contenteditable='true'>"
             "<span> </span>"
             " " // This whitespace causes no previous position.
             "<div id='anchor'> bar</div>"
         "</span>");
     const Position position(document().getElementById("anchor")->firstChild(), 1);
-    EXPECT_EQ(Position(), previousPositionOf(createVisiblePositionDeprecated(position)).deepEquivalent());
+    EXPECT_EQ(Position(), previousPositionOf(createVisiblePosition(position)).deepEquivalent());
 }
 
 TEST_F(VisibleUnitsTest, rendersInDifferentPositionAfterAnchor)
 {
     const char* bodyContent = "<p id='sample'>00</p>";
     setBodyContent(bodyContent);
     Element* sample = document().getElementById("sample");
 
     EXPECT_FALSE(rendersInDifferentPosition(Position(), Position()));
     EXPECT_FALSE(rendersInDifferentPosition(Position(), Position::afterNode(sample)))
@@ skipping 42 matching lines @@
     const char* shadowContent = "<p id=four>4444</p><content select=#two></content><content select=#one></content><p id=five>55555</p>";
     setBodyContent(bodyContent);
     ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
     Node* one = document().getElementById("one")->firstChild();
     Node* two = document().getElementById("two")->firstChild();
     Node* three = document().getElementById("three")->firstChild();
     Node* four = shadowRoot->getElementById("four")->firstChild();
     Node* five = shadowRoot->getElementById("five")->firstChild();
 
-    EXPECT_EQ(Position(), rightPositionOf(createVisiblePositionDeprecated(Position(one, 1))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(five, 0), rightPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(one, 1))).deepEquivalent());
+    EXPECT_EQ(Position(), rightPositionOf(createVisiblePosition(Position(one, 1))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(five, 0), rightPositionOf(createVisiblePosition(PositionInFlatTree(one, 1))).deepEquivalent());
 
-    EXPECT_EQ(Position(one, 1), rightPositionOf(createVisiblePositionDeprecated(Position(two, 2))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(one, 1), rightPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(two, 2))).deepEquivalent());
+    EXPECT_EQ(Position(one, 1), rightPositionOf(createVisiblePosition(Position(two, 2))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(one, 1), rightPositionOf(createVisiblePosition(PositionInFlatTree(two, 2))).deepEquivalent());
 
-    EXPECT_EQ(Position(five, 0), rightPositionOf(createVisiblePositionDeprecated(Position(four, 4))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(two, 0), rightPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(four, 4))).deepEquivalent());
+    EXPECT_EQ(Position(five, 0), rightPositionOf(createVisiblePosition(Position(four, 4))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(two, 0), rightPositionOf(createVisiblePosition(PositionInFlatTree(four, 4))).deepEquivalent());
 
-    EXPECT_EQ(Position(), rightPositionOf(createVisiblePositionDeprecated(Position(five, 5))).deepEquivalent());
-    EXPECT_EQ(PositionInFlatTree(three, 0), rightPositionOf(createVisiblePositionDeprecated(PositionInFlatTree(five, 5))).deepEquivalent());
+    EXPECT_EQ(Position(), rightPositionOf(createVisiblePosition(Position(five, 5))).deepEquivalent());
+    EXPECT_EQ(PositionInFlatTree(three, 0), rightPositionOf(createVisiblePosition(PositionInFlatTree(five, 5))).deepEquivalent());
 }
 
 TEST_F(VisibleUnitsTest, startOfDocument)
 {
     const char* bodyContent = "<a id=host><b id=one>1</b><b id=two>22</b></a>";
     const char* shadowContent = "<p><content select=#two></content></p><p><content select=#one></content></p>";
     setBodyContent(bodyContent);
     setShadowContent(shadowContent, "host");
 
     Node* one = document().getElementById("one")->firstChild();
@@ skipping 80 matching lines @@
     root->setInnerHTML("<style>* { display:inline-table; }</style><body contenteditable=true><svg><svg><foreignObject>abc<svg></svg></foreignObject></svg></svg></body>", ASSERT_NO_EXCEPTION);
     Element* oldBody = document().body();
     root->setInnerHTML("<body contenteditable=true><svg><foreignObject><style>def</style>", ASSERT_NO_EXCEPTION);
     DCHECK_NE(oldBody, document().body());
     Node* foreignObject = document().body()->firstChild()->firstChild();
     foreignObject->insertBefore(oldBody, foreignObject->firstChild());
     Node* styleText = foreignObject->lastChild()->firstChild();
     DCHECK(styleText->isTextNode()) << styleText;
     updateAllLifecyclePhases();
 
-    EXPECT_FALSE(startOfParagraph(createVisiblePositionDeprecated(Position(styleText, 0))).isNull());
+    EXPECT_FALSE(startOfParagraph(createVisiblePosition(Position(styleText, 0))).isNull());
 }
 
 TEST_F(VisibleUnitsTest, startOfSentence)
 {
     const char* bodyContent = "<a id=host><b id=one>1</b><b id=two>22</b></a>";
     const char* shadowContent = "<p><i id=three>333</i> <content select=#two></content> <content select=#one></content> <i id=four>4444</i></p>";
     setBodyContent(bodyContent);
     ShadowRoot* shadowRoot = setShadowContent(shadowContent, "host");
 
     Node* one = document().getElementById("one")->firstChild();
@@ skipping 70 matching lines @@
 {
     // Repro case of crbug.com/584030
     const char* bodyContent = "<button><rt><script>document.designMode = 'on'</script></rt></button>";
     setBodyContent(bodyContent);
 
     Node* button = document().querySelector("button");
     EXPECT_TRUE(endsOfNodeAreVisuallyDistinctPositions(button));
 }
 
 } // namespace blink