Move rendering/RenderImage* to layout/LayoutImage*

Source/core/rendering/RenderMedia.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 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 15 matching lines @@
 #include "config.h"
 
 #include "core/rendering/RenderMedia.h"
 
 #include "core/html/HTMLMediaElement.h"
 #include "core/rendering/RenderView.h"
 
 namespace blink {
 
 RenderMedia::RenderMedia(HTMLMediaElement* video)
-    : RenderImage(video)
+    : LayoutImage(video)
 {
-    setImageResource(RenderImageResource::create());
+    setImageResource(LayoutImageResource::create());
 }
 
 RenderMedia::~RenderMedia()
 {
 }
 
 HTMLMediaElement* RenderMedia::mediaElement() const
 {
     return toHTMLMediaElement(node());
 }
 
 void RenderMedia::layout()
 {
     LayoutSize oldSize = contentBoxRect().size();
 
-    RenderImage::layout();
+    LayoutImage::layout();
 
     RenderBox* controlsRenderer = toRenderBox(m_children.firstChild());
     if (!controlsRenderer)
         return;
 
     bool controlsNeedLayout = controlsRenderer->needsLayout();
     LayoutSize newSize = contentBoxRect().size();
     if (newSize == oldSize && !controlsNeedLayout)
         return;
 
@@ skipping 14 matching lines @@
     // child of replaced content, which is not supposed to be possible. This
     // check can be removed if ::-webkit-media-controls is made internal.
     return child->isFlexibleBox();
 }
 
 void RenderMedia::paintReplaced(const PaintInfo&, const LayoutPoint&)
 {
 }
 
 } // namespace blink