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

third_party/WebKit/Source/core/page/PrintContext.cpp

 /*
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2007 Apple Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 170 matching lines @@
 
     while (object && !object->isBoxModelObject())
         object = object->parent();
     if (!object)
         return nullptr;
     return toLayoutBoxModelObject(object);
 }
 
 int PrintContext::pageNumberForElement(Element* element, const FloatSize& pageSizeInPixels)
 {
-    element->document().updateLayout();
+    element->document().updateStyleAndLayout();
 
     LayoutBoxModelObject* box = enclosingBoxModelObject(element->layoutObject());
     if (!box)
         return -1;
 
     LocalFrame* frame = element->document().frame();
     FloatRect pageRect(FloatPoint(0, 0), pageSizeInPixels);
     PrintContext printContext(frame);
     printContext.begin(pageRect.width(), pageRect.height());
     FloatSize scaledPageSize = pageSizeInPixels;
@@ skipping 93 matching lines @@
 {
     IntSize pageSize(width, height);
     frame->document()->pageSizeAndMarginsInPixels(pageNumber, pageSize, marginTop, marginRight, marginBottom, marginLeft);
 
     return "(" + String::number(pageSize.width()) + ", " + String::number(pageSize.height()) + ") " +
         String::number(marginTop) + ' ' + String::number(marginRight) + ' ' + String::number(marginBottom) + ' ' + String::number(marginLeft);
 }
 
 int PrintContext::numberOfPages(LocalFrame* frame, const FloatSize& pageSizeInPixels)
 {
-    frame->document()->updateLayout();
+    frame->document()->updateStyleAndLayout();
 
     FloatRect pageRect(FloatPoint(0, 0), pageSizeInPixels);
     PrintContext printContext(frame);
     printContext.begin(pageRect.width(), pageRect.height());
     // Account for shrink-to-fit.
     FloatSize scaledPageSize = pageSizeInPixels;
     scaledPageSize.scale(frame->view()->contentsSize().width() / pageRect.width());
     printContext.computePageRectsWithPageSize(scaledPageSize);
     return printContext.pageCount();
 }
 
 DEFINE_TRACE(PrintContext)
 {
     visitor->trace(m_frame);
     visitor->trace(m_linkedDestinations);
 }
 
 } // namespace blink