Merge outline paint phases into the foreground phase.

sky/engine/core/rendering/RenderImage.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
  *
@@ skipping 166 matching lines @@
             context->clip(contentRect);
         }
 
         paintIntoRect(context, paintRect);
 
         if (clip)
             context->restore();
     }
 }
 
-void RenderImage::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
-{
-    RenderReplaced::paint(paintInfo, paintOffset);
-
-    if (paintInfo.phase == PaintPhaseOutline)
-        paintAreaElementFocusRing(paintInfo);
-}
-
-void RenderImage::paintAreaElementFocusRing(PaintInfo& paintInfo)
-{
-}
-
 void RenderImage::paintIntoRect(GraphicsContext* context, const LayoutRect& rect)
 {
     IntRect alignedRect = pixelSnappedIntRect(rect);
     if (!m_imageResource->hasImage() || m_imageResource->errorOccurred() || alignedRect.width() <= 0 || alignedRect.height() <= 0)
         return;
 
     RefPtr<Image> img = m_imageResource->image(alignedRect.width(), alignedRect.height());
     if (!img || img->isNull())
         return;
 
@@ skipping 52 matching lines @@
         return;
     }
 }
 
 bool RenderImage::needsPreferredWidthsRecalculation() const
 {
     return RenderReplaced::needsPreferredWidthsRecalculation();
 }
 
 } // namespace blink