Merge outline paint phases into the foreground phase.

sky/engine/core/rendering/RenderImage.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
@@ skipping 40 matching lines @@
 
     virtual void intrinsicSizeChanged() override;
 
 private:
     virtual bool needsPreferredWidthsRecalculation() const override final;
     virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const override final;
 
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) final;
 
     void paintIntoRect(GraphicsContext*, const LayoutRect&);
-    virtual void paint(PaintInfo&, const LayoutPoint&) override final;
     virtual void layout() override;
 
     virtual const char* renderName() const override { return "RenderImage"; }
 
     virtual bool isImage() const override { return true; }
     virtual bool isRenderImage() const override final { return true; }
 
     virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override;
 
     virtual LayoutUnit minimumReplacedHeight() const override;
 
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
 
     void updateIntrinsicSizeIfNeeded(const LayoutSize& newSize);
     // 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&);
-
     OwnPtr<RenderImageResource> m_imageResource;
     float m_imageDevicePixelRatio;
 
     friend class RenderImageScaleObserver;
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderImage, isRenderImage());
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_RENDERING_RENDERIMAGE_H_