Move rendering/RenderImage* to layout/LayoutImage*

Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 22 matching lines @@
 #include "core/frame/RemoteFrame.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/canvas/CanvasRenderingContext.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorNodeIds.h"
 #include "core/layout/FilterEffectRenderer.h"
 #include "core/layout/LayerStackingNodeIterator.h"
+#include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutVideo.h"
 #include "core/layout/compositing/LayerCompositor.h"
 #include "core/layout/style/KeyframeList.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/paint/LayerPainter.h"
 #include "core/paint/ScrollableAreaPainter.h"
 #include "core/paint/TransformRecorder.h"
 #include "core/plugins/PluginView.h"
 #include "core/rendering/RenderEmbeddedObject.h"
-#include "core/rendering/RenderImage.h"
 #include "core/rendering/RenderPart.h"
 #include "core/rendering/RenderView.h"
 #include "platform/LengthFunctions.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/geometry/TransformState.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipDisplayItem.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/graphics/paint/TransformDisplayItem.h"
@@ skipping 1784 matching lines @@
 // An image can be directly compositing if it's the sole content of the layer, and has no box decorations
 // that require painting. Direct compositing saves backing store.
 bool CompositedLayerMapping::isDirectlyCompositedImage() const
 {
     ASSERT(renderer()->isImage());
 
     LayoutObject* layoutObject = renderer();
     if (m_owningLayer.hasBoxDecorationsOrBackground() || layoutObject->hasClip() || layoutObject->hasClipPath())
         return false;
 
-    RenderImage* imageRenderer = toRenderImage(layoutObject);
+    LayoutImage* imageRenderer = toLayoutImage(layoutObject);
     if (ImageResource* cachedImage = imageRenderer->cachedImage()) {
         if (!cachedImage->hasImage())
             return false;
 
         Image* image = cachedImage->imageForRenderer(imageRenderer);
         return image->isBitmapImage();
     }
 
     return false;
 }
 
 void CompositedLayerMapping::contentChanged(ContentChangeType changeType)
 {
     if ((changeType == ImageChanged) && renderer()->isImage() && isDirectlyCompositedImage()) {
         updateImageContents();
         return;
     }
 
     if (changeType == CanvasChanged && isAcceleratedCanvas(renderer())) {
         m_graphicsLayer->setContentsNeedsDisplay();
         return;
     }
 }
 
 void CompositedLayerMapping::updateImageContents()
 {
     ASSERT(renderer()->isImage());
-    RenderImage* imageRenderer = toRenderImage(renderer());
+    LayoutImage* imageRenderer = toLayoutImage(renderer());
 
     ImageResource* cachedImage = imageRenderer->cachedImage();
     if (!cachedImage)
         return;
 
     Image* image = cachedImage->imageForRenderer(imageRenderer);
     if (!image)
         return;
 
     // We have to wait until the image is fully loaded before setting it on the layer.
@@ skipping 457 matching lines @@
     } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
         name = "Scrolling Block Selection Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink