Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/svg/RenderSVGImage.cpp

 /*
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007, 2008, 2009 Rob Buis <buis@kde.org>
  * Copyright (C) 2009 Google, Inc.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 59 matching lines @@
     // scaling. This can be achieved by setting the image's container size to
     // its viewport size (i.e. if a viewBox is available - use that - else use intrinsic size.)
     // See: http://www.w3.org/TR/SVG/single-page.html, 7.8 The ‘preserveAspectRatio’ attribute.
     Length intrinsicWidth;
     Length intrinsicHeight;
     FloatSize intrinsicRatio;
     cachedImage.computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
     return intrinsicRatio;
 }
 
-static bool containerSizeIsSetForRenderer(ImageResource& cachedImage, const RenderObject* renderer)
+static bool containerSizeIsSetForRenderer(ImageResource& cachedImage, const LayoutObject* renderer)
 {
     const Image* image = cachedImage.image();
     // If a container size has been specified for this renderer, then
     // imageForRenderer() will return the SVGImageForContainer while image()
     // will return the underlying SVGImage.
     return !image->isSVGImage() || image != cachedImage.imageForRenderer(renderer);
 }
 
 bool RenderSVGImage::updateImageViewport()
 {
@@ skipping 77 matching lines @@
         }
     }
 
     return false;
 }
 
 void RenderSVGImage::imageChanged(WrappedImagePtr, const IntRect*)
 {
     // The image resource defaults to nullImage until the resource arrives.
     // This empty image may be cached by SVG resources which must be invalidated.
-    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(this))
+    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForLayoutObject(this))
         resources->removeClientFromCache(this);
 
     // Eventually notify parent resources, that we've changed.
     RenderSVGResourceContainer::markForLayoutAndParentResourceInvalidation(this, false);
 
     // Update the SVGImageCache sizeAndScales entry in case image loading finished after layout.
     // (https://bugs.webkit.org/show_bug.cgi?id=99489)
     m_objectBoundingBox = FloatRect();
     updateImageViewport();
 
     m_bufferedForeground.clear();
 
     setShouldDoFullPaintInvalidation();
 }
 
 void RenderSVGImage::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint&) const
 {
     // this is called from paint() after the localTransform has already been applied
     LayoutRect contentRect = LayoutRect(paintInvalidationRectInLocalCoordinates());
     if (!contentRect.isEmpty())
         rects.append(contentRect);
 }
 
 } // namespace blink