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

third_party/WebKit/Source/core/layout/LayoutTreeAsText.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 523 matching lines @@
             continue;
         write(ts, *child, indent + 1, behavior);
     }
 
     if (o.isLayoutPart()) {
         Widget* widget = toLayoutPart(o).widget();
         if (widget && widget->isFrameView()) {
             FrameView* view = toFrameView(widget);
             LayoutView* root = view->layoutView();
             if (root) {
-                root->document().updateLayout();
+                root->document().updateStyleAndLayout();
                 PaintLayer* layer = root->layer();
                 if (layer)
                     LayoutTreeAsText::writeLayers(ts, layer, layer, layer->rect(), indent + 1, behavior);
             }
         }
     }
 }
 
 enum LayerPaintPhase {
     LayerPaintPhaseAll = 0,
@@ skipping 224 matching lines @@
 
     PaintLayer* layer = layoutObject->layer();
     LayoutTreeAsText::writeLayers(ts, layer, layer, layer->rect(), 0, behavior, markedLayer);
     writeSelection(ts, layoutObject);
     return ts.release();
 }
 
 String externalRepresentation(LocalFrame* frame, LayoutAsTextBehavior behavior, const PaintLayer* markedLayer)
 {
     if (!(behavior & LayoutAsTextDontUpdateLayout))
-        frame->document()->updateLayout();
+        frame->document()->updateStyleAndLayout();
 
     LayoutObject* layoutObject = frame->contentLayoutObject();
     if (!layoutObject || !layoutObject->isBox())
         return String();
 
     PrintContext printContext(frame);
     if (behavior & LayoutAsTextPrintingMode) {
         FloatSize size(toLayoutBox(layoutObject)->size());
         printContext.begin(size.width(), size.height());
     }
 
     return externalRepresentation(toLayoutBox(layoutObject), behavior, markedLayer);
 }
 
 String externalRepresentation(Element* element, LayoutAsTextBehavior behavior)
 {
     // Doesn't support printing mode.
     ASSERT(!(behavior & LayoutAsTextPrintingMode));
     if (!(behavior & LayoutAsTextDontUpdateLayout))
-        element->document().updateLayout();
+        element->document().updateStyleAndLayout();
 
     LayoutObject* layoutObject = element->layoutObject();
     if (!layoutObject || !layoutObject->isBox())
         return String();
 
     return externalRepresentation(toLayoutBox(layoutObject), behavior | LayoutAsTextShowAllLayers);
 }
 
 static void writeCounterValuesFromChildren(TextStream& stream, LayoutObject* parent, bool& isFirstCounter)
 {
     for (LayoutObject* child = parent->slowFirstChild(); child; child = child->nextSibling()) {
         if (child->isCounter()) {
             if (!isFirstCounter)
                 stream << " ";
             isFirstCounter = false;
             String str(toLayoutText(child)->text());
             stream << str;
         }
     }
 }
 
 String counterValueForElement(Element* element)
 {
-    element->document().updateLayout();
+    element->document().updateStyleAndLayout();
     TextStream stream;
     bool isFirstCounter = true;
     // The counter layoutObjects should be children of :before or :after pseudo-elements.
     if (LayoutObject* before = element->pseudoElementLayoutObject(PseudoIdBefore))
         writeCounterValuesFromChildren(stream, before, isFirstCounter);
     if (LayoutObject* after = element->pseudoElementLayoutObject(PseudoIdAfter))
         writeCounterValuesFromChildren(stream, after, isFirstCounter);
     return stream.release();
 }
 
 String markerTextForListItem(Element* element)
 {
-    element->document().updateLayout();
+    element->document().updateStyleAndLayout();
 
     LayoutObject* layoutObject = element->layoutObject();
     if (!layoutObject || !layoutObject->isListItem())
         return String();
 
     return toLayoutListItem(layoutObject)->markerText();
 }
 
 } // namespace blink