Move rendering/RenderImage* to layout/LayoutImage*

Source/core/layout/LayoutImage.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 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.
  *
  * 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.
  *
  */
 
-#ifndef RenderImage_h
-#define RenderImage_h
+#ifndef LayoutImage_h
+#define LayoutImage_h
 
-#include "core/rendering/RenderImageResource.h"
+#include "core/layout/LayoutImageResource.h"
 #include "core/rendering/RenderReplaced.h"
 
 namespace blink {
 
 class HTMLAreaElement;
 class HTMLMapElement;
 
-class RenderImage : public RenderReplaced {
+class LayoutImage : public RenderReplaced {
 public:
     // These are the paddings to use when displaying either alt text or an image.
     static const unsigned short paddingWidth = 4;
     static const unsigned short paddingHeight = 4;
 
-    RenderImage(Element*);
-    virtual ~RenderImage();
+    LayoutImage(Element*);
+    virtual ~LayoutImage();
     virtual void destroy() override;
 
-    static RenderImage* createAnonymous(Document*);
+    static LayoutImage* createAnonymous(Document*);
 
-    void setImageResource(PassOwnPtr<RenderImageResource>);
+    void setImageResource(PassOwnPtr<LayoutImageResource>);
 
-    RenderImageResource* imageResource() { return m_imageResource.get(); }
-    const RenderImageResource* imageResource() const { return m_imageResource.get(); }
+    LayoutImageResource* imageResource() { return m_imageResource.get(); }
+    const LayoutImageResource* imageResource() const { return m_imageResource.get(); }
     ImageResource* cachedImage() const { return m_imageResource ? m_imageResource->cachedImage() : 0; }
 
     HTMLMapElement* imageMap() const;
     void areaElementFocusChanged(HTMLAreaElement*);
 
     void setIsGeneratedContent(bool generated = true) { m_isGeneratedContent = generated; }
 
     bool isGeneratedContent() const { return m_isGeneratedContent; }
 
     inline void setImageDevicePixelRatio(float factor) { m_imageDevicePixelRatio = factor; }
@@ skipping 10 matching lines @@
     virtual RenderBox* embeddedContentBox() const override final;
     virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const override final;
 
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
 
     virtual void paint(const PaintInfo&, const LayoutPoint&) override final;
 
     virtual void layout() override;
     virtual bool updateImageLoadingPriorities() override final;
 
-    virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRenderImage || RenderReplaced::isOfType(type); }
+    virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutImage || RenderReplaced::isOfType(type); }
 
 private:
-    virtual const char* renderName() const override { return "RenderImage"; }
+    virtual const char* renderName() const override { return "LayoutImage"; }
 
     virtual bool isImage() const override { return true; }
 
     virtual void paintReplaced(const PaintInfo&, const LayoutPoint&) override;
 
     virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const override final;
     virtual bool computeBackgroundIsKnownToBeObscured() override final;
 
     virtual bool backgroundShouldAlwaysBeClipped() const override { return true; }
 
     virtual LayoutUnit minimumReplacedHeight() const override;
 
     virtual void notifyFinished(Resource*) override final;
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
 
     virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const override final;
 
     void repaintOrMarkForLayout(const IntRect* = 0);
     void updateIntrinsicSizeIfNeeded(const LayoutSize&);
     // Update the size of the image to be rendered. Object-fit may cause this to be different from the CSS box's content rect.
     void updateInnerContentRect();
 
     // Text to display as long as the image isn't available.
-    OwnPtr<RenderImageResource> m_imageResource;
+    OwnPtr<LayoutImageResource> m_imageResource;
     bool m_didIncrementVisuallyNonEmptyPixelCount;
     bool m_isGeneratedContent;
     float m_imageDevicePixelRatio;
-
-    friend class RenderImageScaleObserver;
 };
 
-DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderImage, isRenderImage());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutImage, isLayoutImage());
 
 } // namespace blink
 
-#endif // RenderImage_h
+#endif // LayoutImage_h