Moving RenderSVG* files from rendering/ to layout/

Source/core/layout/svg/SVGLayoutSupport.cpp

 /*
  * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2009-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
@@ skipping 16 matching lines @@
 
 #include "core/frame/FrameHost.h"
 #include "core/layout/Layer.h"
 #include "core/layout/LayoutGeometryMap.h"
 #include "core/layout/PaintInfo.h"
 #include "core/layout/SubtreeLayoutScope.h"
 #include "core/layout/svg/LayoutSVGInlineText.h"
 #include "core/layout/svg/LayoutSVGResourceClipper.h"
 #include "core/layout/svg/LayoutSVGResourceFilter.h"
 #include "core/layout/svg/LayoutSVGResourceMasker.h"
+#include "core/layout/svg/LayoutSVGShape.h"
 #include "core/layout/svg/LayoutSVGText.h"
 #include "core/layout/svg/SVGResources.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "core/rendering/svg/RenderSVGRoot.h"
-#include "core/rendering/svg/RenderSVGShape.h"
 #include "core/rendering/svg/RenderSVGViewportContainer.h"
 #include "core/svg/SVGElement.h"
 #include "platform/geometry/TransformState.h"
 
 namespace blink {
 
 static inline LayoutRect enclosingIntRectIfNotEmpty(const FloatRect& rect)
 {
     if (rect.isEmpty())
         return LayoutRect();
@@ skipping 118 matching lines @@
     strokeBoundingBox = FloatRect();
 
     // When computing the strokeBoundingBox, we use the paintInvalidationRects of the container's children so that the container's stroke includes
     // the resources applied to the children (such as clips and filters). This allows filters applied to containers to correctly bound
     // the children, and also improves inlining of SVG content, as the stroke bound is used in that situation also.
     for (LayoutObject* current = container->slowFirstChild(); current; current = current->nextSibling()) {
         if (current->isSVGHiddenContainer())
             continue;
 
         // Don't include elements in the union that do not render.
-        if (current->isSVGShape() && toRenderSVGShape(current)->isShapeEmpty())
+        if (current->isSVGShape() && toLayoutSVGShape(current)->isShapeEmpty())
             continue;
 
         const AffineTransform& transform = current->localToParentTransform();
         updateObjectBoundingBox(objectBoundingBox, objectBoundingBoxValid, current,
             transform.mapRect(current->objectBoundingBox()));
         strokeBoundingBox.unite(transform.mapRect(current->paintInvalidationRectInLocalCoordinates()));
     }
 
     paintInvalidationBoundingBox = strokeBoundingBox;
 }
@@ skipping 50 matching lines @@
             if (child->isSVGText())
                 toLayoutSVGText(child)->setNeedsTextMetricsUpdate();
             forceLayout = true;
         }
 
         if (layoutSizeChanged) {
             // When selfNeedsLayout is false and the layout size changed, we have to check whether this child uses relative lengths
             if (SVGElement* element = child->node()->isSVGElement() ? toSVGElement(child->node()) : 0) {
                 if (element->hasRelativeLengths()) {
                     // FIXME: this should be done on invalidation, not during layout.
-                    // When the layout size changed and when using relative values tell the RenderSVGShape to update its shape object
+                    // When the layout size changed and when using relative values tell the LayoutSVGShape to update its shape object
                     if (child->isSVGShape()) {
-                        toRenderSVGShape(child)->setNeedsShapeUpdate();
+                        toLayoutSVGShape(child)->setNeedsShapeUpdate();
                     } else if (child->isSVGText()) {
                         toLayoutSVGText(child)->setNeedsTextMetricsUpdate();
                         toLayoutSVGText(child)->setNeedsPositioningValuesUpdate();
                     }
 
                     forceLayout = true;
                 }
             }
         }
 
@@ skipping 246 matching lines @@
 
         layer = layer->parent();
     }
 
     ctm.scale(deviceScaleFactor);
 
     return narrowPrecisionToFloat(sqrt((pow(ctm.xScale(), 2) + pow(ctm.yScale(), 2)) / 2));
 }
 
 }