Remove unnecessary paintContainer parameter from addFocusRingRects

Source/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 948 matching lines @@
     if (mustInvalidateFillLayersPaintOnHeightChange(style()->backgroundLayers()))
         return true;
 
     // Our fill layers are ok.  Let's check border.
     if (style()->hasBorder() && canRenderBorderImage())
         return true;
 
     return false;
 }
 
-void RenderObject::addChildFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const
-{
-    for (RenderObject* current = slowFirstChild(); current; current = current->nextSibling()) {
-        if (current->isText() || current->isListMarker())
-            continue;
-
-        if (current->isBox()) {
-            RenderBox* box = toRenderBox(current);
-            if (box->hasLayer()) {
-                Vector<LayoutRect> layerFocusRingRects;
-                box->addFocusRingRects(layerFocusRingRects, LayoutPoint(), box);
-                for (size_t i = 0; i < layerFocusRingRects.size(); ++i) {
-                    FloatQuad quadInBox = box->localToContainerQuad(FloatQuad(layerFocusRingRects[i]), paintContainer);
-                    LayoutRect rect = LayoutRect(quadInBox.boundingBox());
-                    if (!rect.isEmpty())
-                        rects.append(rect);
-                }
-            } else {
-                box->addFocusRingRects(rects, additionalOffset + box->locationOffset(), paintContainer);
-            }
-        } else {
-            current->addFocusRingRects(rects, additionalOffset, paintContainer);
-        }
-    }
-}
-
 IntRect RenderObject::absoluteBoundingBoxRect() const
 {
     Vector<FloatQuad> quads;
     absoluteQuads(quads);
 
     size_t n = quads.size();
     if (!n)
         return IntRect();
 
     IntRect result = quads[0].enclosingBoundingBox();
@@ skipping 14 matching lines @@
 
     LayoutRect result = rects[0];
     for (size_t i = 1; i < n; ++i)
         result.unite(rects[i]);
     return pixelSnappedIntRect(result);
 }
 
 IntRect RenderObject::absoluteFocusRingBoundingBoxRect() const
 {
     Vector<LayoutRect> rects;
-    const RenderLayerModelObject* container = containerForPaintInvalidation();
-    addFocusRingRects(rects, LayoutPoint(localToContainerPoint(FloatPoint(), container)), container);
+    const RenderLayerModelObject* container = enclosingLayer()->renderer();
+    addFocusRingRects(rects, LayoutPoint(localToContainerPoint(FloatPoint(), container)));
     return container->localToAbsoluteQuad(FloatQuad(unionRect(rects))).enclosingBoundingBox();
 }
 
 FloatRect RenderObject::absoluteBoundingBoxRectForRange(const Range* range)
 {
     if (!range || !range->startContainer())
         return FloatRect();
 
     range->ownerDocument().updateLayout();
 
@@ skipping 2135 matching lines @@
 {
     if (object1) {
         const blink::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif