Expand FrameSeleciton::start() to increase chances of hoisting update layout

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 <memory>
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
@@ skipping 139 matching lines @@
   Element* sample = document().getElementById("sample");
   const Position endOfText(sample->firstChild(), 3);
   selection().setSelection(
       SelectionInDOMTree::Builder().collapse(endOfText).build());
 
   EXPECT_FALSE(selection().modify(FrameSelection::AlterationMove,
                                   DirectionForward, CharacterGranularity,
                                   NotUserTriggered))
       << "Selection.modify() returns false for non-user-triggered call when "
          "selection isn't modified.";
-  EXPECT_EQ(endOfText, selection().start()) << "Selection isn't modified";
+  EXPECT_EQ(endOfText,
+            selection().computeVisibleSelectionInDOMTreeDeprecated().start())
+      << "Selection isn't modified";
 
   EXPECT_TRUE(selection().modify(FrameSelection::AlterationMove,
                                  DirectionForward, CharacterGranularity,
                                  UserTriggered))
       << "Selection.modify() returns true for user-triggered call";
-  EXPECT_EQ(endOfText, selection().start()) << "Selection isn't modified";
+  EXPECT_EQ(endOfText,
+            selection().computeVisibleSelectionInDOMTreeDeprecated().start())
+      << "Selection isn't modified";
 }
 
 TEST_F(FrameSelectionTest, MoveRangeSelectionTest) {
   // "Foo Bar Baz,"
   Text* text = appendTextNode("Foo Bar Baz,");
   updateAllLifecyclePhases();
 
   // Itinitializes with "Foo B|a>r Baz," (| means start and > means end).
   selection().setSelection(
       SelectionInDOMTree::Builder()
@@ skipping 80 matching lines @@
          "after it.";
 }
 
 TEST_F(FrameSelectionTest, updateIfNeededAndFrameCaret) {
   setBodyContent("<style id=sample></style>");
   document().setDesignMode("on");
   updateAllLifecyclePhases();
   Element* sample = document().getElementById("sample");
   selection().setSelection(
       SelectionInDOMTree::Builder().collapse(Position(sample, 0)).build());
-  EXPECT_EQ(Position(document().body(), 0), selection().start());
-  EXPECT_EQ(selection().start(), caretPosition().position());
+  EXPECT_EQ(Position(document().body(), 0),
+            selection().computeVisibleSelectionInDOMTreeDeprecated().start());
+  EXPECT_EQ(selection().computeVisibleSelectionInDOMTreeDeprecated().start(),
+            caretPosition().position());
   document().body()->remove();
-  EXPECT_EQ(Position(), selection().start())
+  EXPECT_EQ(Position(),
+            selection().computeVisibleSelectionInDOMTreeDeprecated().start())
       << "Selection has been removed by BODY.remove().";
-  EXPECT_EQ(selection().start(), caretPosition().position());
+  EXPECT_EQ(selection().computeVisibleSelectionInDOMTreeDeprecated().start(),
+            caretPosition().position());
   document().updateStyleAndLayout();
   selection().updateIfNeeded();
 
-  EXPECT_EQ(Position(), selection().start())
+  EXPECT_EQ(Position(),
+            selection().computeVisibleSelectionInDOMTreeDeprecated().start())
       << "selection().updateIfNeeded() does nothing.";
-  EXPECT_EQ(selection().start(), caretPosition().position());
+  EXPECT_EQ(selection().computeVisibleSelectionInDOMTreeDeprecated().start(),
+            caretPosition().position());
 }
 
 }  // namespace blink