Rename renderer() to 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 496 matching lines @@
 static void write(TextStream& ts, Layer& layer,
     const LayoutRect& layerBounds, const LayoutRect& backgroundClipRect, const LayoutRect& clipRect, const LayoutRect& outlineClipRect,
     LayerPaintPhase paintPhase = LayerPaintPhaseAll, int indent = 0, LayoutAsTextBehavior behavior = LayoutAsTextBehaviorNormal)
 {
     IntRect adjustedLayoutBounds = pixelSnappedIntRect(layerBounds);
     IntRect adjustedLayoutBoundsWithScrollbars = adjustedLayoutBounds;
     IntRect adjustedBackgroundClipRect = pixelSnappedIntRect(backgroundClipRect);
     IntRect adjustedClipRect = pixelSnappedIntRect(clipRect);
     IntRect adjustedOutlineClipRect = pixelSnappedIntRect(outlineClipRect);
 
-    Settings* settings = layer.renderer()->document().settings();
-    bool reportFrameScrollInfo = layer.renderer()->isLayoutView() && settings && !settings->rootLayerScrolls();
+    Settings* settings = layer.layoutObject()->document().settings();
+    bool reportFrameScrollInfo = layer.layoutObject()->isLayoutView() && settings && !settings->rootLayerScrolls();
 
     if (reportFrameScrollInfo) {
-        LayoutView* layoutView = toLayoutView(layer.renderer());
+        LayoutView* layoutView = toLayoutView(layer.layoutObject());
 
         adjustedLayoutBoundsWithScrollbars.setWidth(layoutView->viewWidth(IncludeScrollbars));
         adjustedLayoutBoundsWithScrollbars.setHeight(layoutView->viewHeight(IncludeScrollbars));
     }
 
     writeIndent(ts, indent);
 
-    if (layer.renderer()->style()->visibility() == HIDDEN)
+    if (layer.layoutObject()->style()->visibility() == HIDDEN)
         ts << "hidden ";
 
     ts << "layer ";
 
     if (behavior & LayoutAsTextShowAddresses)
         ts << static_cast<const void*>(&layer) << " ";
 
     ts << adjustedLayoutBoundsWithScrollbars;
 
     if (!adjustedLayoutBounds.isEmpty()) {
         if (!adjustedBackgroundClipRect.contains(adjustedLayoutBounds))
             ts << " backgroundClip " << adjustedBackgroundClipRect;
         if (!adjustedClipRect.contains(adjustedLayoutBoundsWithScrollbars))
             ts << " clip " << adjustedClipRect;
         if (!adjustedOutlineClipRect.contains(adjustedLayoutBounds))
             ts << " outlineClip " << adjustedOutlineClipRect;
     }
     if (layer.isTransparent())
         ts << " transparent";
 
-    if (layer.renderer()->hasOverflowClip() || reportFrameScrollInfo) {
+    if (layer.layoutObject()->hasOverflowClip() || reportFrameScrollInfo) {
         ScrollableArea* scrollableArea;
         if (reportFrameScrollInfo)
-            scrollableArea = toLayoutView(layer.renderer())->frameView();
+            scrollableArea = toLayoutView(layer.layoutObject())->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.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());
+    if (layer.layoutObject()->style()->hasBlendMode())
+        ts << " blendMode: " << compositeOperatorName(CompositeSourceOver, layer.layoutObject()->style()->blendMode());
 
     if (behavior & LayoutAsTextShowCompositedLayers) {
         if (layer.hasCompositedLayerMapping()) {
             ts << " (composited, bounds="
                 << layer.compositedLayerMapping()->compositedBounds()
                 << ", drawsContent="
                 << layer.compositedLayerMapping()->mainGraphicsLayer()->drawsContent()
                 << (layer.shouldIsolateCompositedDescendants() ? ", isolatesCompositedBlending" : "")
                 << ")";
         }
     }
 
     ts << "\n";
 
     if (paintPhase != LayerPaintPhaseBackground)
-        write(ts, *layer.renderer(), indent + 1, behavior);
+        write(ts, *layer.layoutObject(), indent + 1, behavior);
 }
 
 void LayoutTreeAsText::writeLayers(TextStream& ts, const Layer* rootLayer, Layer* layer,
     const LayoutRect& paintRect, int indent, LayoutAsTextBehavior behavior)
 {
     // Calculate the clip rects we should use.
     LayoutRect layerBounds;
     ClipRect damageRect, clipRectToApply, outlineRect;
     layer->clipper().calculateRects(ClipRectsContext(rootLayer, UncachedClipRects), paintRect, layerBounds, damageRect, clipRectToApply, outlineRect);
 
@@ skipping 130 matching lines @@
     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();
+    LayoutObject* renderer = element->layoutObject();
     if (!renderer || !renderer->isBox())
         return String();
 
     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()) {
@@ skipping 20 matching lines @@
         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();
 
-    LayoutObject* renderer = element->renderer();
+    LayoutObject* renderer = element->layoutObject();
     if (!renderer || !renderer->isListItem())
         return String();
 
     return toLayoutListItem(renderer)->markerText();
 }
 
 } // namespace blink