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

third_party/WebKit/Source/core/css/DragUpdateTest.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/dom/Element.h"
 #include "core/dom/StyleEngine.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/HTMLElement.h"
 #include "core/layout/LayoutObject.h"
@@ skipping 36 matching lines @@
     OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(800, 600));
     HTMLDocument& document = toHTMLDocument(dummyPageHolder->document());
     document.documentElement()->setInnerHTML("<style>div {width:100px;height:100px} div:-webkit-drag .drag { background-color: green }</style>"
         "<div>"
         "<span></span>"
         "<span></span>"
         "<span class='drag'></span>"
         "<span></span>"
         "</div>", ASSERT_NO_EXCEPTION);
 
-    document.updateLayout();
+    document.updateStyleAndLayout();
     unsigned startCount = document.styleEngine().styleForElementCount();
 
     document.documentElement()->layoutObject()->updateDragState(true);
-    document.updateLayout();
+    document.updateStyleAndLayout();
 
     unsigned elementCount = document.styleEngine().styleForElementCount() - startCount;
 
     ASSERT_EQ(1U, elementCount);
 }
 
 TEST(DragUpdateTest, SiblingAffectedByDragUpdate)
 {
     // Check that when dragging the div in the document below, you get a
     // single element style recalc.
 
     OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(800, 600));
     HTMLDocument& document = toHTMLDocument(dummyPageHolder->document());
     document.documentElement()->setInnerHTML("<style>div {width:100px;height:100px} div:-webkit-drag + .drag { background-color: green }</style>"
         "<div>"
         "<span></span>"
         "<span></span>"
         "<span></span>"
         "<span></span>"
         "</div>"
         "<span class='drag'></span>", ASSERT_NO_EXCEPTION);
 
-    document.updateLayout();
+    document.updateStyleAndLayout();
     unsigned startCount = document.styleEngine().styleForElementCount();
 
     document.documentElement()->layoutObject()->updateDragState(true);
-    document.updateLayout();
+    document.updateStyleAndLayout();
 
     unsigned elementCount = document.styleEngine().styleForElementCount() - startCount;
 
     ASSERT_EQ(1U, elementCount);
 }
 
 } // namespace blink