Combine outline and focus ring code paths

Source/core/paint/PaintInfo.h

Index: Source/core/paint/PaintInfo.h
diff --git a/Source/core/paint/PaintInfo.h b/Source/core/paint/PaintInfo.h
index b78df77334cdb45b0f2a837e9edc009d9713bfe0..c991599ecb3ed36d162b452b462ed70027fc290d 100644
--- a/Source/core/paint/PaintInfo.h
+++ b/Source/core/paint/PaintInfo.h
@@ -50,14 +50,12 @@ class LayoutObject;
 struct PaintInfo {
     ALLOW_ONLY_INLINE_ALLOCATION();
     PaintInfo(GraphicsContext* newContext, const IntRect& newRect, PaintPhase newPhase, GlobalPaintFlags globalPaintFlags, PaintLayerFlags paintFlags,
-        LayoutObject* newPaintingRoot = 0, ListHashSet<LayoutInline*>* newOutlineObjects = 0,
-        const LayoutBoxModelObject* newPaintContainer = 0)
+        LayoutObject* newPaintingRoot = 0, const LayoutBoxModelObject* newPaintContainer = 0)
         : context(newContext)
         , rect(newRect)
         , phase(newPhase)
         , paintingRoot(newPaintingRoot)
         , m_paintContainer(newPaintContainer)
-        , m_outlineObjects(newOutlineObjects)
         , m_paintFlags(paintFlags)
         , m_globalPaintFlags(globalPaintFlags)
     {
@@ -91,9 +89,6 @@ struct PaintInfo {
 
     const LayoutBoxModelObject* paintContainer() const { return m_paintContainer; }
 
-    ListHashSet<LayoutInline*>* outlineObjects() const { return m_outlineObjects; }
-    void setOutlineObjects(ListHashSet<LayoutInline*>* objects) { m_outlineObjects = objects; }
-
     GlobalPaintFlags globalPaintFlags() const { return m_globalPaintFlags; }
 
     PaintLayerFlags paintFlags() const { return m_paintFlags; }
@@ -117,7 +112,6 @@ struct PaintInfo {
 
 private:
     const LayoutBoxModelObject* m_paintContainer; // the box model object that originates the current painting
-    ListHashSet<LayoutInline*>* m_outlineObjects; // used to list outlines that should be painted by a block with inline children
 
     const PaintLayerFlags m_paintFlags;
     const GlobalPaintFlags m_globalPaintFlags;