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

third_party/WebKit/Source/web/tests/DocumentLoadingRenderingTest.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/dom/Document.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/paint/PaintLayer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/tests/sim/SimCompositor.h"
@@ skipping 246 matching lines @@
         "<div style='transform: translateZ(0); background: green;'>"
         "    <p style='background: blue;'>Hello Layer</p>"
         "    <div style='position: relative; background: red;'>Hello World</div>"
         "</div>"
     );
 
     // Trigger a layout with pending sheets. For example a page could trigger
     // this by doing offsetTop in a setTimeout, or by a parent frame executing
     // script that touched offsetTop in the child frame.
     auto* childFrame = toHTMLIFrameElement(document().getElementById("frame"));
-    childFrame->contentDocument()->updateLayoutIgnorePendingStylesheets();
+    childFrame->contentDocument()->updateStyleAndLayoutIgnorePendingStylesheets();
 
     auto frame2 = compositor().beginFrame();
 
     // The child frame still has pending sheets, and the parent frame has no
     // invalid paint so we shouldn't draw any text.
     EXPECT_FALSE(frame2.contains(SimCanvas::Text));
 
     LayoutViewItem iframeLayoutViewItem = childFrame->contentDocument()->layoutViewItem();
     const DisplayItemList& displayItemList = iframeLayoutViewItem.layer()->graphicsLayerBacking()->getPaintController().getDisplayItemList();
     // Check that the DisplayItemList has no subsequene caching markers. These are not allowed in pending-style-sheets mode
@@ skipping 58 matching lines @@
     cssBodyResource.complete("a { color: red; }");
     EXPECT_TRUE(document().isRenderingReady());
 
     // Finish the load, painting should stay enabled.
     mainResource.finish();
     EXPECT_TRUE(document().isRenderingReady());
 }
 
 
 } // namespace blink