Remove unnecessary paintContainer parameter from addFocusRingRects

Source/core/rendering/RenderLayerModelObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010, 2012 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 192 matching lines @@
         LayoutRect paintInvalidationRect = r;
         if (GraphicsLayer* squashingLayer = layer()->groupedMapping()->squashingLayer()) {
             // Note: the subpixel accumulation of layer() does not need to be added here. It is already taken into account.
             squashingLayer->setNeedsDisplayInRect(pixelSnappedIntRect(paintInvalidationRect), invalidationReason);
         }
     } else {
         layer()->compositedLayerMapping()->setContentsNeedDisplayInRect(r, invalidationReason);
     }
 }
 
+void RenderLayerModelObject::addChildFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
+{
+    for (RenderObject* current = slowFirstChild(); current; current = current->nextSibling()) {
+        if (current->isText() || current->isListMarker())
+            continue;
+
+        if (current->isBox()) {

[dsinclair, 2014/11/06 23:56:22]

if (!current->isBox()) {
  current->addFocusRingRects(rects, additonalOffset);
  continue;
}

Similar for box->hasLayer below.

[Xianzhu, 2014/11/12 19:10:14]

Done.

+            RenderBox* box = toRenderBox(current);
+            if (box->hasLayer()) {
+                Vector<LayoutRect> layerFocusRingRects;
+                box->addFocusRingRects(layerFocusRingRects, LayoutPoint());
+                for (size_t i = 0; i < layerFocusRingRects.size(); ++i) {
+                    FloatQuad quadInBox = box->localToContainerQuad(FloatQuad(layerFocusRingRects[i]), this);
+                    LayoutRect rect = LayoutRect(quadInBox.boundingBox());
+                    if (!rect.isEmpty()) {
+                        rect.moveBy(additionalOffset);
+                        rects.append(rect);
+                    }
+                }
+            } else {
+                box->addFocusRingRects(rects, additionalOffset + box->locationOffset());
+            }
+        } else {
+            current->addFocusRingRects(rects, additionalOffset);
+        }
+    }
+}
+
 } // namespace blink