Move rendering/RenderImage* to layout/LayoutImage*

Source/core/loader/ImageLoader.cpp

Index: Source/core/loader/ImageLoader.cpp
diff --git a/Source/core/loader/ImageLoader.cpp b/Source/core/loader/ImageLoader.cpp
index 71dec27c9ea12e5d25d271d3cb00d6355740b5c2..e8bb1402e8eb6c5c10f9b87344350cc549472b65 100644
--- a/Source/core/loader/ImageLoader.cpp
+++ b/Source/core/loader/ImageLoader.cpp
@@ -35,8 +35,8 @@
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
+#include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutVideo.h"
-#include "core/rendering/RenderImage.h"
 #include "core/rendering/svg/RenderSVGImage.h"
 #include "platform/Logging.h"
 #include "platform/weborigin/SecurityOrigin.h"
@@ -180,7 +180,7 @@ void ImageLoader::setImageWithoutConsideringPendingLoadEvent(ImageResource* newI
             oldImage->removeClient(this);
     }
 
-    if (RenderImageResource* imageResource = renderImageResource())
+    if (LayoutImageResource* imageResource = layoutImageResource())
         imageResource->resetAnimation();
 }
 
@@ -314,10 +314,10 @@ void ImageLoader::doUpdateFromElement(BypassMainWorldBehavior bypassBehavior, Up
         if (oldImage)
             oldImage->removeClient(this);
     } else if (updateBehavior == UpdateSizeChanged && m_element->renderer() && m_element->renderer()->isImage()) {
-        toRenderImage(m_element->renderer())->intrinsicSizeChanged();
+        toLayoutImage(m_element->renderer())->intrinsicSizeChanged();
     }
 
-    if (RenderImageResource* imageResource = renderImageResource())
+    if (LayoutImageResource* imageResource = layoutImageResource())
         imageResource->resetAnimation();
 
     // Only consider updating the protection ref-count of the Element immediately before returning
@@ -426,7 +426,7 @@ void ImageLoader::notifyFinished(Resource* resource)
     loadEventSender().dispatchEventSoon(this);
 }
 
-RenderImageResource* ImageLoader::renderImageResource()
+LayoutImageResource* ImageLoader::layoutImageResource()
 {
     LayoutObject* renderer = m_element->renderer();
 
@@ -435,8 +435,8 @@ RenderImageResource* ImageLoader::renderImageResource()
 
     // We don't return style generated image because it doesn't belong to the ImageLoader.
     // See <https://bugs.webkit.org/show_bug.cgi?id=42840>
-    if (renderer->isImage() && !static_cast<RenderImage*>(renderer)->isGeneratedContent())
-        return toRenderImage(renderer)->imageResource();
+    if (renderer->isImage() && !static_cast<LayoutImage*>(renderer)->isGeneratedContent())
+        return toLayoutImage(renderer)->imageResource();
 
     if (renderer->isSVGImage())
         return toRenderSVGImage(renderer)->imageResource();
@@ -449,7 +449,7 @@ RenderImageResource* ImageLoader::renderImageResource()
 
 void ImageLoader::updateRenderer()
 {
-    RenderImageResource* imageResource = renderImageResource();
+    LayoutImageResource* imageResource = layoutImageResource();
 
     if (!imageResource)
         return;