Rename renderer() to layoutObject().

Source/core/layout/svg/line/SVGInlineTextBox.cpp

 /**
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 60 matching lines @@
 int SVGInlineTextBox::offsetForPosition(FloatWillBeLayoutUnit, bool) const
 {
     // SVG doesn't use the standard offset <-> position selection system, as it's not suitable for SVGs complex needs.
     // vertical text selection, inline boxes spanning multiple lines (contrary to HTML, etc.)
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 int SVGInlineTextBox::offsetForPositionInFragment(const SVGTextFragment& fragment, FloatWillBeLayoutUnit position, bool includePartialGlyphs) const
 {
-    LayoutSVGInlineText& textRenderer = toLayoutSVGInlineText(this->renderer());
+    LayoutSVGInlineText& textRenderer = toLayoutSVGInlineText(this->layoutObject());
 
     float scalingFactor = textRenderer.scalingFactor();
     ASSERT(scalingFactor);
 
     const LayoutStyle& style = textRenderer.styleRef();
 
     TextRun textRun = constructTextRun(style, fragment);
 
     // Eventually handle lengthAdjust="spacingAndGlyphs".
     // FIXME: Handle vertical text.
     AffineTransform fragmentTransform;
     fragment.buildFragmentTransform(fragmentTransform);
     if (!fragmentTransform.isIdentity())
         textRun.setHorizontalGlyphStretch(narrowPrecisionToFloat(fragmentTransform.xScale()));
 
     return fragment.characterOffset - start() + textRenderer.scaledFont().offsetForPosition(textRun, position * scalingFactor, includePartialGlyphs);
 }
 
 FloatWillBeLayoutUnit SVGInlineTextBox::positionForOffset(int) const
 {
     // SVG doesn't use the offset <-> position selection system.
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 FloatRectWillBeLayoutRect SVGInlineTextBox::selectionRectForTextFragment(const SVGTextFragment& fragment, int startPosition, int endPosition, const LayoutStyle& style)
 {
     ASSERT(startPosition < endPosition);
 
-    LayoutSVGInlineText& textRenderer = toLayoutSVGInlineText(this->renderer());
+    LayoutSVGInlineText& textRenderer = toLayoutSVGInlineText(this->layoutObject());
 
     float scalingFactor = textRenderer.scalingFactor();
     ASSERT(scalingFactor);
 
     const Font& scaledFont = textRenderer.scaledFont();
     const FontMetrics& scaledFontMetrics = scaledFont.fontMetrics();
     FloatPointWillBeLayoutPoint textOrigin(fragment.x, fragment.y);
     if (scalingFactor != 1)
         textOrigin.scale(scalingFactor, scalingFactor);
 
     textOrigin.move(0, -scaledFontMetrics.floatAscent());
 
     FloatRectWillBeLayoutRect selectionRect = scaledFont.selectionRectForText(constructTextRun(style, fragment), textOrigin.toFloatPoint(), fragment.height * scalingFactor, startPosition, endPosition);
     if (scalingFactor == 1)
         return selectionRect;
 
     selectionRect.scale(1 / scalingFactor);
     return selectionRect;
 }
 
 LayoutRect SVGInlineTextBox::localSelectionRect(int startPosition, int endPosition)
 {
     int boxStart = start();
     startPosition = std::max(startPosition - boxStart, 0);
     endPosition = std::min(endPosition - boxStart, static_cast<int>(len()));
     if (startPosition >= endPosition)
         return LayoutRect();
 
-    const LayoutStyle& style = renderer().styleRef();
+    const LayoutStyle& style = layoutObject().styleRef();
 
     AffineTransform fragmentTransform;
     FloatRectWillBeLayoutRect selectionRect;
     int fragmentStartPosition = 0;
     int fragmentEndPosition = 0;
 
     unsigned textFragmentsSize = m_textFragments.size();
     for (unsigned i = 0; i < textFragmentsSize; ++i) {
         const SVGTextFragment& fragment = m_textFragments.at(i);
 
@@ skipping 14 matching lines @@
     return LayoutRect(enclosingIntRect(selectionRect.rawValue()));
 }
 
 void SVGInlineTextBox::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit, LayoutUnit)
 {
     SVGInlineTextBoxPainter(*this).paint(paintInfo, paintOffset);
 }
 
 TextRun SVGInlineTextBox::constructTextRun(const LayoutStyle& style, const SVGTextFragment& fragment) const
 {
-    LayoutText* text = &renderer();
+    LayoutText* text = &layoutObject();
 
     // FIXME(crbug.com/264211): This should not be necessary but can occur if we
     //                          layout during layout. Remove this when 264211 is fixed.
     RELEASE_ASSERT(!text->needsLayout());
 
     TextRun run(static_cast<const LChar*>(0) // characters, will be set below if non-zero.
         , 0 // length, will be set below if non-zero.
         , 0 // xPos, only relevant with allowTabs=true
         , 0 // padding, only relevant for justified text, not relevant for SVG
         , TextRun::AllowTrailingExpansion
@@ skipping 50 matching lines @@
 
 void SVGInlineTextBox::paintTextMatchMarker(GraphicsContext* context, const FloatPointWillBeLayoutPoint& point, DocumentMarker* marker, const LayoutStyle& style, const Font& font)
 {
     SVGInlineTextBoxPainter(*this).paintTextMatchMarker(context, point.toFloatPoint(), marker, style, font);
 }
 
 FloatRectWillBeLayoutRect SVGInlineTextBox::calculateBoundaries() const
 {
     FloatRectWillBeLayoutRect textRect;
 
-    LayoutSVGInlineText& textRenderer = toLayoutSVGInlineText(this->renderer());
+    LayoutSVGInlineText& textRenderer = toLayoutSVGInlineText(this->layoutObject());
 
     float scalingFactor = textRenderer.scalingFactor();
     ASSERT(scalingFactor);
 
     FloatWillBeLayoutUnit baseline = textRenderer.scaledFont().fontMetrics().floatAscent() / scalingFactor;
 
     AffineTransform fragmentTransform;
     unsigned textFragmentsSize = m_textFragments.size();
     for (unsigned i = 0; i < textFragmentsSize; ++i) {
         const SVGTextFragment& fragment = m_textFragments.at(i);
         FloatRectWillBeLayoutRect fragmentRect(fragment.x, fragment.y - baseline, fragment.width, fragment.height);
         fragment.buildFragmentTransform(fragmentTransform);
         fragmentRect = fragmentTransform.mapRect(fragmentRect.toFloatRect());
 
         textRect.unite(fragmentRect);
     }
 
     return textRect;
 }
 
 bool SVGInlineTextBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit, LayoutUnit)
 {
     // FIXME: integrate with InlineTextBox::nodeAtPoint better.
     ASSERT(!isLineBreak());
 
-    PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING, request, renderer().style()->pointerEvents());
-    bool isVisible = renderer().style()->visibility() == VISIBLE;
+    PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING, request, layoutObject().style()->pointerEvents());
+    bool isVisible = layoutObject().style()->visibility() == VISIBLE;
     if (isVisible || !hitRules.requireVisible) {
         if (hitRules.canHitBoundingBox
-            || (hitRules.canHitStroke && (renderer().style()->svgStyle().hasStroke() || !hitRules.requireStroke))
-            || (hitRules.canHitFill && (renderer().style()->svgStyle().hasFill() || !hitRules.requireFill))) {
+            || (hitRules.canHitStroke && (layoutObject().style()->svgStyle().hasStroke() || !hitRules.requireStroke))
+            || (hitRules.canHitFill && (layoutObject().style()->svgStyle().hasFill() || !hitRules.requireFill))) {
             FloatPointWillBeLayoutPoint boxOrigin(x(), y());
             boxOrigin.moveBy(accumulatedOffset);
             FloatRectWillBeLayoutRect rect(boxOrigin, size());
             // FIXME: both calls to rawValue() below is temporary and should be removed once the transition
             // to LayoutUnit-based types is complete (crbug.com/321237)
             if (locationInContainer.intersects(rect.rawValue())) {
-                renderer().updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
-                if (!result.addNodeToListBasedTestResult(renderer().node(), request, locationInContainer, rect.rawValue()))
+                layoutObject().updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
+                if (!result.addNodeToListBasedTestResult(layoutObject().node(), request, locationInContainer, rect.rawValue()))
                     return true;
             }
         }
     }
     return false;
 }
 
 } // namespace blink