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

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DAPITest.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 "modules/canvas2d/CanvasRenderingContext2D.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLDocument.h"
@@ skipping 291 matching lines @@
 }
 
 TEST_F(CanvasRenderingContext2DAPITest, AccessibilityRectTestForDrawFocusIfNeeded)
 {
     resetCanvasForAccessibilityRectTest(document());
 
     Element* buttonElement = document().getElementById("button");
     HTMLCanvasElement* canvas = toHTMLCanvasElement(document().getElementById("canvas"));
     CanvasRenderingContext2D* context = static_cast<CanvasRenderingContext2D*>(canvas->renderingContext());
 
-    document().updateLayoutTreeForNode(canvas);
+    document().updateStyleAndLayoutTreeForNode(canvas);
 
     context->beginPath();
     context->rect(10, 10, 40, 40);
     context->drawFocusIfNeeded(buttonElement);
 
     AXObjectCacheImpl* axObjectCache = toAXObjectCacheImpl(document().existingAXObjectCache());
     AXObject* axObject = axObjectCache->getOrCreate(buttonElement);
 
     EXPECT_EQ(25, axObject->elementRect().x().toInt());
     EXPECT_EQ(25, axObject->elementRect().y().toInt());
     EXPECT_EQ(40, axObject->elementRect().width().toInt());
     EXPECT_EQ(40, axObject->elementRect().height().toInt());
 }
 
 } // namespace blink