Moving RenderSVG* files from rendering/ to layout/

Source/core/svg/SVGImageElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rob Buis <buis@kde.org>
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  *
  * 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 
 #include "core/svg/SVGImageElement.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/XLinkNames.h"
 #include "core/layout/LayoutImageResource.h"
-#include "core/rendering/svg/RenderSVGImage.h"
+#include "core/layout/svg/LayoutSVGImage.h"
 
 namespace blink {
 
 inline SVGImageElement::SVGImageElement(Document& document)
     : SVGGraphicsElement(SVGNames::imageTag, document)
     , m_x(SVGAnimatedLength::create(this, SVGNames::xAttr, SVGLength::create(LengthModeWidth), AllowNegativeLengths))
     , m_y(SVGAnimatedLength::create(this, SVGNames::yAttr, SVGLength::create(LengthModeHeight), AllowNegativeLengths))
     , m_width(SVGAnimatedLength::create(this, SVGNames::widthAttr, SVGLength::create(LengthModeWidth), ForbidNegativeLengths))
     , m_height(SVGAnimatedLength::create(this, SVGNames::heightAttr, SVGLength::create(LengthModeHeight), ForbidNegativeLengths))
     , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(this, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio::create()))
@@ skipping 18 matching lines @@
     visitor->trace(m_width);
     visitor->trace(m_height);
     visitor->trace(m_preserveAspectRatio);
     visitor->trace(m_imageLoader);
     SVGGraphicsElement::trace(visitor);
     SVGURIReference::trace(visitor);
 }
 
 bool SVGImageElement::currentFrameHasSingleSecurityOrigin() const
 {
-    if (RenderSVGImage* renderSVGImage = toRenderSVGImage(renderer())) {
+    if (LayoutSVGImage* renderSVGImage = toLayoutSVGImage(renderer())) {
         if (renderSVGImage->imageResource()->hasImage()) {
             if (Image* image = renderSVGImage->imageResource()->cachedImage()->image())
                 return image->currentFrameHasSingleSecurityOrigin();
         }
     }
 
     return true;
 }
 
 bool SVGImageElement::isSupportedAttribute(const QualifiedName& attrName)
@@ skipping 55 matching lines @@
         else
             m_needsLoaderURIUpdate = true;
         return;
     }
 
     LayoutObject* renderer = this->renderer();
     if (!renderer)
         return;
 
     if (isLengthAttribute) {
-        if (toRenderSVGImage(renderer)->updateImageViewport())
+        if (toLayoutSVGImage(renderer)->updateImageViewport())
             markForLayoutAndParentResourceInvalidation(renderer);
         return;
     }
 
     if (attrName == SVGNames::preserveAspectRatioAttr) {
         markForLayoutAndParentResourceInvalidation(renderer);
         return;
     }
 
     ASSERT_NOT_REACHED();
 }
 
 bool SVGImageElement::selfHasRelativeLengths() const
 {
     return m_x->currentValue()->isRelative()
         || m_y->currentValue()->isRelative()
         || m_width->currentValue()->isRelative()
         || m_height->currentValue()->isRelative();
 }
 
 LayoutObject* SVGImageElement::createRenderer(const LayoutStyle&)
 {
-    return new RenderSVGImage(this);
+    return new LayoutSVGImage(this);
 }
 
 bool SVGImageElement::haveLoadedRequiredResources()
 {
     return !m_needsLoaderURIUpdate && !imageLoader().hasPendingActivity();
 }
 
 void SVGImageElement::attach(const AttachContext& context)
 {
     SVGGraphicsElement::attach(context);
 
-    if (RenderSVGImage* imageObj = toRenderSVGImage(renderer())) {
+    if (LayoutSVGImage* imageObj = toLayoutSVGImage(renderer())) {
         if (imageObj->imageResource()->hasImage())
             return;
 
         imageObj->imageResource()->setImageResource(imageLoader().image());
     }
 }
 
 Node::InsertionNotificationRequest SVGImageElement::insertedInto(ContainerNode* rootParent)
 {
     SVGGraphicsElement::insertedInto(rootParent);
@@ skipping 20 matching lines @@
     return AtomicString(hrefString());
 }
 
 void SVGImageElement::didMoveToNewDocument(Document& oldDocument)
 {
     imageLoader().elementDidMoveToNewDocument();
     SVGGraphicsElement::didMoveToNewDocument(oldDocument);
 }
 
 } // namespace blink