Move paint code from RenderImage/RenderVideo into ImagePainter/VideoPainter.

Source/core/rendering/RenderImage.h

Index: Source/core/rendering/RenderImage.h
diff --git a/Source/core/rendering/RenderImage.h b/Source/core/rendering/RenderImage.h
index 33adcf0adde82c3bdc3609b9b85c75bc784c940e..91f377ae00fca3cf0c86416f2fb40bffb34d5a20 100644
--- a/Source/core/rendering/RenderImage.h
+++ b/Source/core/rendering/RenderImage.h
@@ -35,6 +35,10 @@ class HTMLMapElement;
 
 class RenderImage : public RenderReplaced {
 public:
+    // If we'll be displaying either alt text or an image, add some padding.

[Stephen Chennney, 2014/09/24 15:08:18]

I would rather "The padding to use when ..."

[chrishtr, 2014/09/24 16:30:26]

Done.

+    static const unsigned short paddingWidth = 4;
+    static const unsigned short paddingHeight = 4;

[Stephen Chennney, 2014/09/24 15:08:18]

Why not put these in the painter class?

[chrishtr, 2014/09/24 16:30:25]

They are also referred to in this class, for layout.

+
     RenderImage(Element*);
     virtual ~RenderImage();
     virtual void destroy() OVERRIDE;
@@ -78,7 +82,6 @@ protected:
 
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE;
 
-    void paintIntoRect(GraphicsContext*, const LayoutRect&);
     virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
     virtual void layout() OVERRIDE;
     virtual bool updateImageLoadingPriorities() OVERRIDE FINAL;
@@ -107,8 +110,6 @@ private:
     // Update the size of the image to be rendered. Object-fit may cause this to be different from the CSS box's content rect.
     void updateInnerContentRect();
 
-    void paintAreaElementFocusRing(PaintInfo&);
-
     // Text to display as long as the image isn't available.
     String m_altText;
     OwnPtr<RenderImageResource> m_imageResource;