Move rendering/RenderImage* to layout/LayoutImage*

Source/core/html/HTMLImageElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google 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 26 matching lines @@
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLImageFallbackHelper.h"
 #include "core/html/HTMLSourceElement.h"
 #include "core/html/canvas/CanvasRenderingContext.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/parser/HTMLSrcsetParser.h"
 #include "core/inspector/ConsoleMessage.h"
+#include "core/layout/LayoutImage.h"
 #include "core/page/Page.h"
 #include "core/rendering/RenderBlockFlow.h"
-#include "core/rendering/RenderImage.h"
 #include "platform/ContentType.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 class HTMLImageElement::ViewportChangeListener final : public MediaQueryListListener {
@@ skipping 184 matching lines @@
     float candidateDensity = candidate.density();
     if (candidateDensity >= 0)
         m_imageDevicePixelRatio = 1.0 / candidateDensity;
     if (candidate.resourceWidth() > 0) {
         m_intrinsicSizingViewportDependant = true;
         UseCounter::count(document(), UseCounter::SrcsetWDescriptor);
     } else if (!candidate.srcOrigin()) {
         UseCounter::count(document(), UseCounter::SrcsetXDescriptor);
     }
     if (renderer() && renderer()->isImage())
-        toRenderImage(renderer())->setImageDevicePixelRatio(m_imageDevicePixelRatio);
+        toLayoutImage(renderer())->setImageDevicePixelRatio(m_imageDevicePixelRatio);
 }
 
 void HTMLImageElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
     if (name == altAttr || name == titleAttr) {
         if (userAgentShadowRoot()) {
             Element* text = userAgentShadowRoot()->getElementById("alttext");
             String value = altText();
             if (text && text->textContent() != value)
                 text->setTextContent(altText());
@@ skipping 69 matching lines @@
 }
 
 LayoutObject* HTMLImageElement::createRenderer(const LayoutStyle& style)
 {
     if (style.hasContent())
         return LayoutObject::createObject(this, style);
 
     if (m_useFallbackContent)
         return new RenderBlockFlow(this);
 
-    RenderImage* image = new RenderImage(this);
-    image->setImageResource(RenderImageResource::create());
+    LayoutImage* image = new LayoutImage(this);
+    image->setImageResource(LayoutImageResource::create());
     image->setImageDevicePixelRatio(m_imageDevicePixelRatio);
     return image;
 }
 
 void HTMLImageElement::attach(const AttachContext& context)
 {
     HTMLElement::attach(context);
 
     if (renderer() && renderer()->isImage()) {
-        RenderImage* renderImage = toRenderImage(renderer());
-        RenderImageResource* renderImageResource = renderImage->imageResource();
+        LayoutImage* layoutImage = toLayoutImage(renderer());
+        LayoutImageResource* layoutImageResource = layoutImage->imageResource();
         if (m_isFallbackImage) {
-            float deviceScaleFactor = blink::deviceScaleFactor(renderImage->frame());
+            float deviceScaleFactor = blink::deviceScaleFactor(layoutImage->frame());
             pair<Image*, float> brokenImageAndImageScaleFactor = ImageResource::brokenImage(deviceScaleFactor);
             ImageResource* newImageResource = new ImageResource(brokenImageAndImageScaleFactor.first);
-            renderImage->imageResource()->setImageResource(newImageResource);
+            layoutImage->imageResource()->setImageResource(newImageResource);
         }
-        if (renderImageResource->hasImage())
+        if (layoutImageResource->hasImage())
             return;
 
-        if (!imageLoader().image() && !renderImageResource->cachedImage())
+        if (!imageLoader().image() && !layoutImageResource->cachedImage())
             return;
-        renderImageResource->setImageResource(imageLoader().image());
+        layoutImageResource->setImageResource(imageLoader().image());
     }
 }
 
 Node::InsertionNotificationRequest HTMLImageElement::insertedInto(ContainerNode* insertionPoint)
 {
     if (!m_formWasSetByParser || NodeTraversal::highestAncestorOrSelf(*insertionPoint) != NodeTraversal::highestAncestorOrSelf(*m_form.get()))
         resetFormOwner();
     if (m_listener)
         document().mediaQueryMatcher().addViewportListener(m_listener);
 
@@ skipping 244 matching lines @@
     return FloatSize(image->imageSizeForRenderer(renderer(), 1.0f));
 }
 
 FloatSize HTMLImageElement::defaultDestinationSize() const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
     LayoutSize size;
     size = image->imageSizeForRenderer(renderer(), 1.0f);
-    if (renderer() && renderer()->isRenderImage() && image->image() && !image->image()->hasRelativeWidth())
-        size.scale(toRenderImage(renderer())->imageDevicePixelRatio());
+    if (renderer() && renderer()->isLayoutImage() && image->image() && !image->image()->hasRelativeWidth())
+        size.scale(toLayoutImage(renderer())->imageDevicePixelRatio());
     return FloatSize(size);
 }
 
 void HTMLImageElement::selectSourceURL(ImageLoader::UpdateFromElementBehavior behavior)
 {
     if (!document().isActive())
         return;
 
     bool foundURL = false;
     if (RuntimeEnabledFeatures::pictureEnabled()) {
@@ skipping 81 matching lines @@
     ensureUserAgentShadowRoot();
 }
 
 bool HTMLImageElement::isOpaque() const
 {
     Image* image = const_cast<HTMLImageElement*>(this)->imageContents();
     return image && image->currentFrameKnownToBeOpaque();
 }
 
 }