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

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 5434 matching lines @@
   registerMockedHttpURLLoad("move_range_selection_extent_input_field.html");
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(
       m_baseURL + "move_range_selection_extent_input_field.html",
       &webViewHelper);
   frame = webViewHelper.webView()->mainFrameImpl();
   EXPECT_EQ("Length", selectionAsString(frame));
   webViewHelper.webView()->selectionBounds(startWebRect, endWebRect);
 
-  EXPECT_EQ(0, frame->frame()->selection().rootEditableElement()->scrollLeft());
+  EXPECT_EQ(0, frame->frame()
+                   ->selection()
+                   .computeVisibleSelectionInDOMTreeDeprecated()
+                   .rootEditableElement()
+                   ->scrollLeft());
   frame->moveRangeSelectionExtent(WebPoint(endWebRect.x + 500, endWebRect.y));
-  EXPECT_GE(frame->frame()->selection().rootEditableElement()->scrollLeft(), 1);
+  EXPECT_GE(frame->frame()
+                ->selection()
+                .computeVisibleSelectionInDOMTreeDeprecated()
+                .rootEditableElement()
+                ->scrollLeft(),
+            1);
   EXPECT_EQ("Lengthy text goes here.", selectionAsString(frame));
 }
 
 static int computeOffset(LayoutObject* layoutObject, int x, int y) {
   return createVisiblePosition(
              layoutObject->positionForPoint(LayoutPoint(x, y)))
       .deepEquivalent()
       .computeOffsetInContainerNode();
 }
 
 // positionForPoint returns the wrong values for contenteditable spans. See
 // http://crbug.com/238334.
 TEST_P(ParameterizedWebFrameTest, DISABLED_PositionForPointTest) {
   registerMockedHttpURLLoad("select_range_span_editable.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "select_range_span_editable.html",
                                  &webViewHelper);
   WebLocalFrameImpl* mainFrame = webViewHelper.webView()->mainFrameImpl();
-  LayoutObject* layoutObject =
-      mainFrame->frame()->selection().rootEditableElement()->layoutObject();
+  LayoutObject* layoutObject = mainFrame->frame()
+                                   ->selection()
+                                   .computeVisibleSelectionInDOMTreeDeprecated()
+                                   .rootEditableElement()
+                                   ->layoutObject();
   EXPECT_EQ(0, computeOffset(layoutObject, -1, -1));
   EXPECT_EQ(64, computeOffset(layoutObject, 1000, 1000));
 
   registerMockedHttpURLLoad("select_range_div_editable.html");
   initializeTextSelectionWebView(m_baseURL + "select_range_div_editable.html",
                                  &webViewHelper);
   mainFrame = webViewHelper.webView()->mainFrameImpl();
-  layoutObject =
-      mainFrame->frame()->selection().rootEditableElement()->layoutObject();
+  layoutObject = mainFrame->frame()
+                     ->selection()
+                     .computeVisibleSelectionInDOMTreeDeprecated()
+                     .rootEditableElement()
+                     ->layoutObject();
   EXPECT_EQ(0, computeOffset(layoutObject, -1, -1));
   EXPECT_EQ(64, computeOffset(layoutObject, 1000, 1000));
 }
 
 #if !OS(MACOSX) && !OS(LINUX)
 TEST_P(ParameterizedWebFrameTest,
        SelectRangeStaysHorizontallyAlignedWhenMoved) {
   registerMockedHttpURLLoad("move_caret.html");
 
   FrameTestHelpers::WebViewHelper webViewHelper;
@@ skipping 5883 matching lines @@
 
   EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
 
   webViewHelper.reset();
 }
 
 }  // namespace blink