Move and rename RenderReplaced and RenderHTMLCanvas to Layout{Replaced,HTMLCanvas}.

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 LayoutImage_h
 #define LayoutImage_h
 
 #include "core/layout/LayoutImageResource.h"
-#include "core/rendering/RenderReplaced.h"
+#include "core/layout/LayoutReplaced.h"
 
 namespace blink {
 
 class HTMLAreaElement;
 class HTMLMapElement;
 
-class LayoutImage : public RenderReplaced {
+class LayoutImage : public LayoutReplaced {
 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;
 
     LayoutImage(Element*);
     virtual ~LayoutImage();
     virtual void destroy() override;
 
     static LayoutImage* createAnonymous(Document*);
@@ skipping 25 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 == LayoutObjectLayoutImage || RenderReplaced::isOfType(type); }
+    virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutImage || LayoutReplaced::isOfType(type); }
 
 private:
     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;
@@ skipping 17 matching lines @@
     bool m_didIncrementVisuallyNonEmptyPixelCount;
     bool m_isGeneratedContent;
     float m_imageDevicePixelRatio;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutImage, isLayoutImage());
 
 } // namespace blink
 
 #endif // LayoutImage_h