Combine outline and focus ring code paths

Source/core/paint/PaintInfo.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google 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
@@ skipping 30 matching lines @@
 #include <limits>
 
 namespace blink {
 
 class LayoutInline;
 class LayoutBoxModelObject;
 class LayoutObject;
 
 struct PaintInfo {
     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)
     {
     }
 
     void updatePaintingRootForChildren(const LayoutObject* layoutObject)
     {
         if (!paintingRoot)
             return;
 
@@ skipping 13 matching lines @@
 
     bool skipRootBackground() const { return m_paintFlags & PaintLayerPaintingSkipRootBackground; }
     bool paintRootBackgroundOnly() const { return m_paintFlags & PaintLayerPaintingRootBackgroundOnly; }
 
     bool isPrinting() const { return m_globalPaintFlags & GlobalPaintPrinting; }
 
     DisplayItem::Type displayItemTypeForClipping() const { return DisplayItem::paintPhaseToClipBoxType(phase); }
 
     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; }
 
     bool intersectsCullRect(const AffineTransform& transform, const FloatRect& boundingBox) const
     {
         return transform.mapRect(boundingBox).intersects(rect);
     }
 
     void updateCullRectForSVGTransform(const AffineTransform& localToParentTransform)
     {
         if (rect != LayoutRect::infiniteIntRect())
             rect = localToParentTransform.inverse().mapRect(rect);
     }
 
     // FIXME: Introduce setters/getters at some point. Requires a lot of changes throughout layout/.
     GraphicsContext* context;
     IntRect rect; // dirty rect used for culling non-intersecting layoutObjects
     PaintPhase phase;
     LayoutObject* paintingRoot; // used to draw just one element and its visual kids
 
 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;
 };
 
 } // namespace blink
 
 #endif // PaintInfo_h