Rename RenderText to LayoutText

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 171 matching lines @@
         }
     }
 
     LayoutBlock* cb = o.containingBlock();
     bool adjustForTableCells = cb ? cb->isTableCell() : false;
 
     LayoutRect r;
     if (o.isText()) {
         // FIXME: Would be better to dump the bounding box x and y rather than the first run's x and y, but that would involve updating
         // many test results.
-        const RenderText& text = toRenderText(o);
+        const LayoutText& text = toLayoutText(o);
         IntRect linesBox = text.linesBoundingBox();
         r = LayoutRect(IntRect(text.firstRunX(), text.firstRunY(), linesBox.width(), linesBox.height()));
         if (adjustForTableCells && !text.firstTextBox())
             adjustForTableCells = false;
     } else if (o.isLayoutInline()) {
         // FIXME: Would be better not to just dump 0, 0 as the x and y here.
         const LayoutInline& inlineFlow = toLayoutInline(o);
         r = LayoutRect(IntRect(0, 0, inlineFlow.linesBoundingBox().width(), inlineFlow.linesBoundingBox().height()));
         adjustForTableCells = false;
     } else if (o.isTableCell()) {
@@ skipping 194 matching lines @@
             if (havePrevious)
                 ts << ",";
             ts << " positioned child";
         }
 
         if (needsLayout)
             ts << ")";
     }
 }
 
-static void writeTextRun(TextStream& ts, const RenderText& o, const InlineTextBox& run)
+static void writeTextRun(TextStream& ts, const LayoutText& o, const InlineTextBox& run)
 {
     // FIXME: For now use an "enclosingIntRect" model for x, y and logicalWidth, although this makes it harder
     // to detect any changes caused by the conversion to floating point. :(
     int x = run.x();
     int y = run.y();
     int logicalWidth = ceilf(run.left() + run.logicalWidth()) - x;
 
     // FIXME: Table cell adjustment is temporary until results can be updated.
     if (o.containingBlock()->isTableCell())
         y -= toLayoutTableCell(o.containingBlock())->intrinsicPaddingBefore();
@@ skipping 45 matching lines @@
         writeSVGImage(ts, toLayoutSVGImage(o), indent);
         return;
     }
 
     writeIndent(ts, indent);
 
     LayoutTreeAsText::writeLayoutObject(ts, o, behavior);
     ts << "\n";
 
     if (o.isText() && !o.isBR()) {
-        const RenderText& text = toRenderText(o);
+        const LayoutText& text = toLayoutText(o);
         for (InlineTextBox* box = text.firstTextBox(); box; box = box->nextTextBox()) {
             writeIndent(ts, indent + 1);
             writeTextRun(ts, text, *box);
         }
     }
 
     for (LayoutObject* child = o.slowFirstChild(); child; child = child->nextSibling()) {
         if (child->hasLayer())
             continue;
         write(ts, *child, indent + 1, behavior);
@@ skipping 261 matching lines @@
     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());
+            String str(toLayoutText(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();
@@ skipping 14 matching lines @@
     element->document().updateLayout();
 
     LayoutObject* renderer = element->renderer();
     if (!renderer || !renderer->isListItem())
         return String();
 
     return toLayoutListItem(renderer)->markerText();
 }
 
 } // namespace blink