Rename rendering in core/svg.

Source/core/svg/SVGSVGElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Google, Inc.
  *
  * 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 127 matching lines @@
     if (!inDocument() || !isOutermostSVGSVGElement())
         return 1;
 
     LocalFrame* frame = document().frame();
     if (!frame)
         return 1;
 
     const FrameTree& frameTree = frame->tree();
 
     // The behaviour of currentScale() is undefined, when we're dealing with non-standalone SVG documents.
-    // If the svg is embedded, the scaling is handled by the host renderer, so when asking from inside
+    // If the svg is embedded, the scaling is handled by the host layoutObject, so when asking from inside
     // the SVG document, a scale value of 1 seems reasonable, as it doesn't know anything about the parent scale.
     return frameTree.parent() ? 1 : frame->pageZoomFactor();
 }
 
 void SVGSVGElement::setCurrentScale(float scale)
 {
     ASSERT(std::isfinite(scale));
     if (!inDocument() || !isOutermostSVGSVGElement())
         return;
 
@@ skipping 176 matching lines @@
 {
     if (r1.width() < 0 || r1.height() < 0 || r2.width() < 0 || r2.height() < 0)
         return false;
 
     return r1.x() < r2.maxX() && r2.x() < r1.maxX()
         && r1.y() < r2.maxY() && r2.y() < r1.maxY();
 }
 
 // One of the element types that can cause graphics to be drawn onto the target canvas.
 // Specifically: circle, ellipse, image, line, path, polygon, polyline, rect, text and use.
-static bool isIntersectionOrEnclosureTarget(LayoutObject* renderer)
+static bool isIntersectionOrEnclosureTarget(LayoutObject* layoutObject)
 {
-    return renderer->isSVGShape()
-        || renderer->isSVGText()
-        || renderer->isSVGImage()
-        || isSVGUseElement(*renderer->node());
+    return layoutObject->isSVGShape()
+        || layoutObject->isSVGText()
+        || layoutObject->isSVGImage()
+        || isSVGUseElement(*layoutObject->node());
 }
 
 bool SVGSVGElement::checkIntersectionOrEnclosure(const SVGElement& element, const FloatRect& rect,
     CheckIntersectionOrEnclosure mode) const
 {
-    LayoutObject* renderer = element.layoutObject();
-    ASSERT(!renderer || renderer->style());
-    if (!renderer || renderer->style()->pointerEvents() == PE_NONE)
+    LayoutObject* layoutObject = element.layoutObject();
+    ASSERT(!layoutObject || layoutObject->style());
+    if (!layoutObject || layoutObject->style()->pointerEvents() == PE_NONE)
         return false;
 
-    if (!isIntersectionOrEnclosureTarget(renderer))
+    if (!isIntersectionOrEnclosureTarget(layoutObject))
         return false;
 
     AffineTransform ctm = toSVGGraphicsElement(element).computeCTM(AncestorScope, DisallowStyleUpdate, this);
-    FloatRect mappedRepaintRect = ctm.mapRect(renderer->paintInvalidationRectInLocalCoordinates());
+    FloatRect mappedRepaintRect = ctm.mapRect(layoutObject->paintInvalidationRectInLocalCoordinates());
 
     bool result = false;
     switch (mode) {
     case CheckIntersection:
         result = intersectsAllowingEmpty(rect, mappedRepaintRect);
         break;
     case CheckEnclosure:
         result = rect.contains(mappedRepaintRect);
         break;
     default:
@@ skipping 110 matching lines @@
     if (!hasEmptyViewBox()) {
         FloatSize size = currentViewportSize();
         viewBoxTransform = viewBoxToViewTransform(size.width(), size.height());
     }
 
     AffineTransform transform;
     if (!isOutermostSVGSVGElement()) {
         SVGLengthContext lengthContext(this);
         transform.translate(m_x->currentValue()->value(lengthContext), m_y->currentValue()->value(lengthContext));
     } else if (mode == SVGElement::ScreenScope) {
-        if (LayoutObject* renderer = this->layoutObject()) {
+        if (LayoutObject* layoutObject = this->layoutObject()) {
             FloatPoint location;
             float zoomFactor = 1;
 
             // At the SVG/HTML boundary (aka LayoutSVGRoot), we apply the localToBorderBoxTransform
             // to map an element from SVG viewport coordinates to CSS box coordinates.
             // LayoutSVGRoot's localToAbsolute method expects CSS box coordinates.
             // We also need to adjust for the zoom level factored into CSS coordinates (bug #96361).
-            if (renderer->isSVGRoot()) {
-                location = toLayoutSVGRoot(renderer)->localToBorderBoxTransform().mapPoint(location);
-                zoomFactor = 1 / renderer->style()->effectiveZoom();
+            if (layoutObject->isSVGRoot()) {
+                location = toLayoutSVGRoot(layoutObject)->localToBorderBoxTransform().mapPoint(location);
+                zoomFactor = 1 / layoutObject->style()->effectiveZoom();
             }
 
             // Translate in our CSS parent coordinate space
             // FIXME: This doesn't work correctly with CSS transforms.
-            location = renderer->localToAbsolute(location, UseTransforms);
+            location = layoutObject->localToAbsolute(location, UseTransforms);
             location.scale(zoomFactor, zoomFactor);
 
             // Be careful here! localToBorderBoxTransform() included the x/y offset coming from the viewBoxToViewTransform(),
             // so we have to subtract it here (original cause of bug #27183)
             transform.translate(location.x() - viewBoxTransform.e(), location.y() - viewBoxTransform.f());
 
             // Respect scroll offset.
             if (FrameView* view = document().view()) {
                 LayoutSize scrollOffset(view->scrollOffset());
                 scrollOffset.scale(zoomFactor);
@@ skipping 162 matching lines @@
 
     AffineTransform transform;
     if (transformList->concatenate(transform))
         ctm *= transform;
 
     return ctm;
 }
 
 void SVGSVGElement::setupInitialView(const String& fragmentIdentifier, Element* anchorNode)
 {
-    LayoutObject* renderer = this->layoutObject();
+    LayoutObject* layoutObject = this->layoutObject();
     SVGViewSpec* view = m_viewSpec.get();
     if (view)
         view->reset();
 
     bool hadUseCurrentView = m_useCurrentView;
     m_useCurrentView = false;
 
     if (fragmentIdentifier.startsWith("xpointer(")) {
         // FIXME: XPointer references are ignored (https://bugs.webkit.org/show_bug.cgi?id=17491)
-        if (renderer && hadUseCurrentView)
-            markForLayoutAndParentResourceInvalidation(renderer);
+        if (layoutObject && hadUseCurrentView)
+            markForLayoutAndParentResourceInvalidation(layoutObject);
         return;
     }
 
     if (fragmentIdentifier.startsWith("svgView(")) {
         if (!view)
             view = currentView(); // Create the SVGViewSpec.
 
         view->inheritViewAttributesFromElement(this);
 
         if (view->parseViewSpec(fragmentIdentifier))
             m_useCurrentView = true;
         else
             view->reset();
 
-        if (renderer && (hadUseCurrentView || m_useCurrentView))
-            markForLayoutAndParentResourceInvalidation(renderer);
+        if (layoutObject && (hadUseCurrentView || m_useCurrentView))
+            markForLayoutAndParentResourceInvalidation(layoutObject);
         return;
     }
 
     // Spec: If the SVG fragment identifier addresses a 'view' element within an SVG document (e.g., MyDrawing.svg#MyView
     // or MyDrawing.svg#xpointer(id('MyView'))) then the closest ancestor 'svg' element is displayed in the viewport.
     // Any view specification attributes included on the given 'view' element override the corresponding view specification
     // attributes on the closest ancestor 'svg' element.
     // TODO(ed): The spec text above is a bit unclear.
     // Should the transform from outermost svg to nested svg be applied to "display"
     // the inner svg in the viewport, then let the view element override the inner
     // svg's view specification attributes. Should it fill/override the outer viewport?
     if (isSVGViewElement(anchorNode)) {
         SVGViewElement& viewElement = toSVGViewElement(*anchorNode);
 
         if (SVGSVGElement* svg = viewElement.ownerSVGElement()) {
             svg->inheritViewAttributes(&viewElement);
 
-            if (LayoutObject* renderer = svg->layoutObject())
-                markForLayoutAndParentResourceInvalidation(renderer);
+            if (LayoutObject* layoutObject = svg->layoutObject())
+                markForLayoutAndParentResourceInvalidation(layoutObject);
 
             return;
         }
     }
 
     // If we previously had a view and didn't get a new one, we need to
     // layout again.
-    if (renderer && hadUseCurrentView)
-        markForLayoutAndParentResourceInvalidation(renderer);
+    if (layoutObject && hadUseCurrentView)
+        markForLayoutAndParentResourceInvalidation(layoutObject);
 
     // FIXME: We need to decide which <svg> to focus on, and zoom to it.
     // FIXME: We need to actually "highlight" the viewTarget(s).
 }
 
 void SVGSVGElement::inheritViewAttributes(SVGViewElement* viewElement)
 {
     SVGViewSpec* view = currentView();
     m_useCurrentView = true;
     view->inheritViewAttributesFromElement(this);
@@ skipping 20 matching lines @@
     visitor->trace(m_width);
     visitor->trace(m_height);
     visitor->trace(m_translation);
     visitor->trace(m_timeContainer);
     visitor->trace(m_viewSpec);
     SVGGraphicsElement::trace(visitor);
     SVGFitToViewBox::trace(visitor);
 }
 
 } // namespace blink