Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.()

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 83 matching lines @@
     document().view()->updateAllLifecyclePhases();
 
     VisibleSelection validSelection(Position(text, 0), Position(text, 0));
     setSelection(validSelection);
     selection().setCaretRectNeedsUpdate();
     EXPECT_TRUE(selection().isCaretBoundsDirty());
     selection().invalidateCaretRect();
     EXPECT_FALSE(selection().isCaretBoundsDirty());
 
     document().body()->removeChild(text);
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
     selection().setCaretRectNeedsUpdate();
     EXPECT_TRUE(selection().isCaretBoundsDirty());
     selection().invalidateCaretRect();
     EXPECT_FALSE(selection().isCaretBoundsDirty());
 }
 
 TEST_F(FrameSelectionTest, PaintCaretShouldNotLayout)
 {
     Text* text = appendTextNode("Hello, World!");
     document().view()->updateAllLifecyclePhases();
@@ skipping 56 matching lines @@
     EXPECT_TRUE(isPreviousCaretDirtyForTesting());
     selection().invalidateCaretRect();
     EXPECT_FALSE(selection().isCaretBoundsDirty());
     EXPECT_TRUE(isPreviousCaretDirtyForTesting());
 
     // Simulate to remove the last character.
     document().body()->removeChild(text);
     // This line is the objective of this test.
     // As removing the last character, early previousCaret invalidation is executed.
     EXPECT_FALSE(isPreviousCaretDirtyForTesting());
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
     selection().setCaretRectNeedsUpdate();
     EXPECT_TRUE(selection().isCaretBoundsDirty());
     EXPECT_FALSE(isPreviousCaretDirtyForTesting());
     selection().invalidateCaretRect();
     EXPECT_FALSE(selection().isCaretBoundsDirty());
     EXPECT_TRUE(isPreviousCaretDirtyForTesting());
 }
 
 #define EXPECT_EQ_SELECTED_TEXT(text) \
     EXPECT_EQ(text, WebString(selection().selectedText()).utf8())
@@ skipping 91 matching lines @@
 
 TEST_F(FrameSelectionTest, SelectAllWithUnselectableRoot)
 {
     Element* select = document().createElement("select", ASSERT_NO_EXCEPTION);
     document().replaceChild(select, document().documentElement());
     selection().selectAll();
     EXPECT_TRUE(selection().isNone()) << "Nothing should be selected if the content of the documentElement is not selctable.";
 }
 
 } // namespace blink