Move rendering/RenderObject to layout/LayoutObject.

Source/core/fetch/ImageResource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. 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 20 matching lines @@
 #include "platform/graphics/ImageObserver.h"
 #include "wtf/HashMap.h"
 
 namespace blink {
 
 class ImageResourceClient;
 class ResourceFetcher;
 class FloatSize;
 class Length;
 class MemoryCache;
-class RenderObject;
+class LayoutObject;
 class SecurityOrigin;
 
 class ImageResource final : public Resource, public ImageObserver {
     friend class MemoryCache;
 
 public:
     typedef ImageResourceClient ClientType;
 
     ImageResource(const ResourceRequest&);
     ImageResource(blink::Image*);
     // Exposed for testing
     ImageResource(const ResourceRequest&, blink::Image*);
     virtual ~ImageResource();
 
     virtual void load(ResourceFetcher*, const ResourceLoaderOptions&) override;
 
     blink::Image* image(); // Returns the nullImage() if the image is not available yet.
-    blink::Image* imageForRenderer(const RenderObject*); // Returns the nullImage() if the image is not available yet.
+    blink::Image* imageForRenderer(const LayoutObject*); // Returns the nullImage() if the image is not available yet.
     bool hasImage() const { return m_image.get(); }
     // Side effect: ensures decoded image is in cache, therefore should only be called when about to draw the image.
     // FIXME: Decoding image on the main thread is expensive, so rather than forcing decode, consider returning false
     // when image is not decoded yet, as we do in case of deferred decoding.
-    bool currentFrameKnownToBeOpaque(const RenderObject*);
+    bool currentFrameKnownToBeOpaque(const LayoutObject*);
 
     static std::pair<blink::Image*, float> brokenImage(float deviceScaleFactor); // Returns an image and the image's resolution scale factor.
     bool willPaintBrokenImage() const;
 
-    bool canRender(const RenderObject& renderer, float multiplier) { return !errorOccurred() && !imageSizeForRenderer(&renderer, multiplier).isEmpty(); }
+    bool canRender(const LayoutObject& renderer, float multiplier) { return !errorOccurred() && !imageSizeForRenderer(&renderer, multiplier).isEmpty(); }
 
     void setContainerSizeForRenderer(const ImageResourceClient*, const IntSize&, float);
     bool usesImageContainerSize() const;
     bool imageHasRelativeWidth() const;
     bool imageHasRelativeHeight() const;
     // The device pixel ratio we got from the server for this image, or 1.0.
     float devicePixelRatioHeaderValue() const { return m_devicePixelRatioHeaderValue; }
     bool hasDevicePixelRatioHeaderValue() const { return m_hasDevicePixelRatioHeaderValue; }
 
     enum SizeType {
         NormalSize, // Report the size of the image associated with a certain renderer
         IntrinsicSize // Report the intrinsic size, i.e. ignore whatever has been set extrinsically.
     };
     // This method takes a zoom multiplier that can be used to increase the natural size of the image by the zoom.
-    LayoutSize imageSizeForRenderer(const RenderObject*, float multiplier, SizeType = NormalSize); // returns the size of the complete image.
+    LayoutSize imageSizeForRenderer(const LayoutObject*, float multiplier, SizeType = NormalSize); // returns the size of the complete image.
     void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
 
     static void updateBitmapImages(HashSet<ImageResource*>&, bool redecodeImages = false);
 
     bool isAccessAllowed(ExecutionContext*, SecurityOrigin*);
 
     void updateImageAnimationPolicy();
 
     virtual void didAddClient(ResourceClient*) override;
     virtual void didRemoveClient(ResourceClient*) override;
@@ skipping 44 matching lines @@
     OwnPtr<SVGImageCache> m_svgImageCache;
     bool m_loadingMultipartContent;
     bool m_hasDevicePixelRatioHeaderValue;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);
 
 }
 
 #endif