Move rendering/RenderBox to layout/LayoutBox.

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 188 matching lines @@
         const RenderInline& inlineFlow = toRenderInline(o);
         r = IntRect(0, 0, inlineFlow.linesBoundingBox().width(), inlineFlow.linesBoundingBox().height());
         adjustForTableCells = false;
     } else if (o.isTableCell()) {
         // FIXME: Deliberately dump the "inner" box of table cells, since that is what current results reflect.  We'd like
         // to clean up the results to dump both the outer box and the intrinsic padding so that both bits of information are
         // captured by the results.
         const LayoutTableCell& cell = toLayoutTableCell(o);
         r = LayoutRect(cell.location().x(), cell.location().y() + cell.intrinsicPaddingBefore(), cell.size().width(), cell.size().height() - cell.intrinsicPaddingBefore() - cell.intrinsicPaddingAfter());
     } else if (o.isBox()) {
-        r = toRenderBox(&o)->frameRect();
+        r = toLayoutBox(&o)->frameRect();
     }
 
     // FIXME: Temporary in order to ensure compatibility with existing layout test results.
     if (adjustForTableCells)
         r.move(0, -toLayoutTableCell(o.containingBlock())->intrinsicPaddingBefore());
 
     if (o.isRenderView()) {
         r.setWidth(toRenderView(o).viewWidth(IncludeScrollbars));
         r.setHeight(toRenderView(o).viewHeight(IncludeScrollbars));
     }
@@ skipping 332 matching lines @@
         if (reportFrameScrollInfo)
             scrollableArea = toRenderView(layer.renderer())->frameView();
         else
             scrollableArea = layer.scrollableArea();
 
         DoublePoint adjustedScrollOffset = scrollableArea->scrollPositionDouble() + toDoubleSize(scrollableArea->scrollOrigin());
         if (adjustedScrollOffset.x())
             ts << " scrollX " << adjustedScrollOffset.x();
         if (adjustedScrollOffset.y())
             ts << " scrollY " << adjustedScrollOffset.y();
-        if (layer.renderBox() && layer.renderBox()->pixelSnappedClientWidth() != layer.renderBox()->pixelSnappedScrollWidth())
-            ts << " scrollWidth " << layer.renderBox()->pixelSnappedScrollWidth();
-        if (layer.renderBox() && layer.renderBox()->pixelSnappedClientHeight() != layer.renderBox()->pixelSnappedScrollHeight())
-            ts << " scrollHeight " << layer.renderBox()->pixelSnappedScrollHeight();
+        if (layer.layoutBox() && layer.layoutBox()->pixelSnappedClientWidth() != layer.layoutBox()->pixelSnappedScrollWidth())
+            ts << " scrollWidth " << layer.layoutBox()->pixelSnappedScrollWidth();
+        if (layer.layoutBox() && layer.layoutBox()->pixelSnappedClientHeight() != layer.layoutBox()->pixelSnappedScrollHeight())
+            ts << " scrollHeight " << layer.layoutBox()->pixelSnappedScrollHeight();
     }
 
     if (paintPhase == LayerPaintPhaseBackground)
         ts << " layerType: background only";
     else if (paintPhase == LayerPaintPhaseForeground)
         ts << " layerType: foreground only";
 
     if (layer.renderer()->style()->hasBlendMode())
         ts << " blendMode: " << compositeOperatorName(CompositeSourceOver, layer.renderer()->style()->blendMode());
 
@@ skipping 120 matching lines @@
         ts << "caret: position " << selection.start().deprecatedEditingOffset() << " of " << nodePositionAsStringForTesting(selection.start().deprecatedNode());
         if (selection.affinity() == UPSTREAM)
             ts << " (upstream affinity)";
         ts << "\n";
     } else if (selection.isRange()) {
         ts << "selection start: position " << selection.start().deprecatedEditingOffset() << " of " << nodePositionAsStringForTesting(selection.start().deprecatedNode()) << "\n"
             << "selection end:   position " << selection.end().deprecatedEditingOffset() << " of " << nodePositionAsStringForTesting(selection.end().deprecatedNode()) << "\n";
     }
 }
 
-static String externalRepresentation(RenderBox* renderer, LayoutAsTextBehavior behavior)
+static String externalRepresentation(LayoutBox* renderer, LayoutAsTextBehavior behavior)
 {
     TextStream ts;
     if (!renderer->hasLayer())
         return ts.release();
 
     Layer* layer = renderer->layer();
     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();
 
     LayoutObject* renderer = frame->contentRenderer();
     if (!renderer || !renderer->isBox())
         return String();
 
     PrintContext printContext(frame);
     if (behavior & LayoutAsTextPrintingMode)
-        printContext.begin(toRenderBox(renderer)->size().width().toFloat());
+        printContext.begin(toLayoutBox(renderer)->size().width().toFloat());
 
-    return externalRepresentation(toRenderBox(renderer), behavior);
+    return externalRepresentation(toLayoutBox(renderer), behavior);
 }
 
 String externalRepresentation(Element* element, LayoutAsTextBehavior behavior)
 {
     // Doesn't support printing mode.
     ASSERT(!(behavior & LayoutAsTextPrintingMode));
     if (!(behavior & LayoutAsTextDontUpdateLayout))
         element->document().updateLayout();
 
     LayoutObject* renderer = element->renderer();
     if (!renderer || !renderer->isBox())
         return String();
 
-    return externalRepresentation(toRenderBox(renderer), behavior | LayoutAsTextShowAllLayers);
+    return externalRepresentation(toLayoutBox(renderer), 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(toRenderText(child)->text());
@@ skipping 24 matching lines @@
     element->document().updateLayout();
 
     LayoutObject* renderer = element->renderer();
     if (!renderer || !renderer->isListItem())
         return String();
 
     return toLayoutListItem(renderer)->markerText();
 }
 
 } // namespace blink