Move rendering/RenderObject to layout/LayoutObject.

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 144 matching lines @@
     }
     result.append('"');
     return result.toString();
 }
 
 TextStream& operator<<(TextStream& ts, const Color& c)
 {
     return ts << c.nameForLayoutTreeAsText();
 }
 
-void LayoutTreeAsText::writeRenderObject(TextStream& ts, const RenderObject& o, LayoutAsTextBehavior behavior)
+void LayoutTreeAsText::writeLayoutObject(TextStream& ts, const LayoutObject& o, LayoutAsTextBehavior behavior)
 {
     ts << o.renderName();
 
     if (behavior & LayoutAsTextShowAddresses)
         ts << " " << static_cast<const void*>(&o);
 
     if (o.style() && o.style()->zIndex())
         ts << " zI: " << o.style()->zIndex();
 
     if (o.node()) {
@@ skipping 247 matching lines @@
         if (run.dirOverride())
             ts << " override";
     }
     ts << ": "
         << quoteAndEscapeNonPrintables(String(o.text()).substring(run.start(), run.len()));
     if (run.hasHyphen())
         ts << " + hyphen string " << quoteAndEscapeNonPrintables(o.style()->hyphenString());
     ts << "\n";
 }
 
-void write(TextStream& ts, const RenderObject& o, int indent, LayoutAsTextBehavior behavior)
+void write(TextStream& ts, const LayoutObject& o, int indent, LayoutAsTextBehavior behavior)
 {
     if (o.isSVGShape()) {
         write(ts, toRenderSVGShape(o), indent);
         return;
     }
     if (o.isSVGGradientStop()) {
         writeSVGGradientStop(ts, toRenderSVGGradientStop(o), indent);
         return;
     }
     if (o.isSVGResourceContainer()) {
@@ skipping 16 matching lines @@
         writeSVGInlineText(ts, toRenderSVGInlineText(o), indent);
         return;
     }
     if (o.isSVGImage()) {
         writeSVGImage(ts, toRenderSVGImage(o), indent);
         return;
     }
 
     writeIndent(ts, indent);
 
-    LayoutTreeAsText::writeRenderObject(ts, o, behavior);
+    LayoutTreeAsText::writeLayoutObject(ts, o, behavior);
     ts << "\n";
 
     if (o.isText() && !o.isBR()) {
         const RenderText& text = toRenderText(o);
         for (InlineTextBox* box = text.firstTextBox(); box; box = box->nextTextBox()) {
             writeIndent(ts, indent + 1);
             writeTextRun(ts, text, *box);
         }
     }
 
-    for (RenderObject* child = o.slowFirstChild(); child; child = child->nextSibling()) {
+    for (LayoutObject* child = o.slowFirstChild(); child; child = child->nextSibling()) {
         if (child->hasLayer())
             continue;
         write(ts, *child, indent + 1, behavior);
     }
 
     if (o.isRenderPart()) {
         Widget* widget = toRenderPart(o).widget();
         if (widget && widget->isFrameView()) {
             FrameView* view = toFrameView(widget);
             RenderView* root = view->renderView();
@@ skipping 182 matching lines @@
                 result.append('}');
             }
         } else {
             result.appendLiteral("document");
         }
     }
 
     return result.toString();
 }
 
-static void writeSelection(TextStream& ts, const RenderObject* o)
+static void writeSelection(TextStream& ts, const LayoutObject* o)
 {
     Node* n = o->node();
     if (!n || !n->isDocumentNode())
         return;
 
     Document* doc = toDocument(n);
     LocalFrame* frame = doc->frame();
     if (!frame)
         return;
 
@@ skipping 19 matching lines @@
     LayoutTreeAsText::writeLayers(ts, layer, layer, layer->rect(), 0, behavior);
     writeSelection(ts, renderer);
     return ts.release();
 }
 
 String externalRepresentation(LocalFrame* frame, LayoutAsTextBehavior behavior)
 {
     if (!(behavior & LayoutAsTextDontUpdateLayout))
         frame->document()->updateLayout();
 
-    RenderObject* renderer = frame->contentRenderer();
+    LayoutObject* renderer = frame->contentRenderer();
     if (!renderer || !renderer->isBox())
         return String();
 
     PrintContext printContext(frame);
     if (behavior & LayoutAsTextPrintingMode)
         printContext.begin(toRenderBox(renderer)->size().width().toFloat());
 
     return externalRepresentation(toRenderBox(renderer), behavior);
 }
 
 String externalRepresentation(Element* element, LayoutAsTextBehavior behavior)
 {
     // Doesn't support printing mode.
     ASSERT(!(behavior & LayoutAsTextPrintingMode));
     if (!(behavior & LayoutAsTextDontUpdateLayout))
         element->document().updateLayout();
 
-    RenderObject* renderer = element->renderer();
+    LayoutObject* renderer = element->renderer();
     if (!renderer || !renderer->isBox())
         return String();
 
     return externalRepresentation(toRenderBox(renderer), behavior | LayoutAsTextShowAllLayers);
 }
 
-static void writeCounterValuesFromChildren(TextStream& stream, RenderObject* parent, bool& isFirstCounter)
+static void writeCounterValuesFromChildren(TextStream& stream, LayoutObject* parent, bool& isFirstCounter)
 {
-    for (RenderObject* child = parent->slowFirstChild(); child; child = child->nextSibling()) {
+    for (LayoutObject* child = parent->slowFirstChild(); child; child = child->nextSibling()) {
         if (child->isCounter()) {
             if (!isFirstCounter)
                 stream << " ";
             isFirstCounter = false;
             String str(toRenderText(child)->text());
             stream << str;
         }
     }
 }
 
 String counterValueForElement(Element* element)
 {
     // Make sure the element is not freed during the layout.
     RefPtrWillBeRawPtr<Element> protector(element);
     element->document().updateLayout();
     TextStream stream;
     bool isFirstCounter = true;
     // The counter renderers should be children of :before or :after pseudo-elements.
-    if (RenderObject* before = element->pseudoElementRenderer(BEFORE))
+    if (LayoutObject* before = element->pseudoElementRenderer(BEFORE))
         writeCounterValuesFromChildren(stream, before, isFirstCounter);
-    if (RenderObject* after = element->pseudoElementRenderer(AFTER))
+    if (LayoutObject* after = element->pseudoElementRenderer(AFTER))
         writeCounterValuesFromChildren(stream, after, isFirstCounter);
     return stream.release();
 }
 
 String markerTextForListItem(Element* element)
 {
     // Make sure the element is not freed during the layout.
     RefPtrWillBeRawPtr<Element> protector(element);
     element->document().updateLayout();
 
-    RenderObject* renderer = element->renderer();
+    LayoutObject* renderer = element->renderer();
     if (!renderer || !renderer->isListItem())
         return String();
 
     return toRenderListItem(renderer)->markerText();
 }
 
 } // namespace blink