Merge 144350

Source/WebCore/rendering/svg/RenderSVGShape.cpp

Index: Source/WebCore/rendering/svg/RenderSVGShape.cpp
===================================================================
--- Source/WebCore/rendering/svg/RenderSVGShape.cpp	(revision 145114)
+++ Source/WebCore/rendering/svg/RenderSVGShape.cpp	(working copy)
@@ -297,13 +297,13 @@
         }
 
         if (drawsOutline)
-            paintOutline(childPaintInfo.context, IntRect(boundingBox));
+            paintOutline(childPaintInfo, IntRect(boundingBox));
     }
 }
 
 // This method is called from inside paintOutline() since we call paintOutline()
 // while transformed to our coord system, return local coords
-void RenderSVGShape::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint&)
+void RenderSVGShape::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint&, const RenderLayerModelObject*)
 {
     IntRect rect = enclosingIntRect(repaintRectInLocalCoordinates());
     if (!rect.isEmpty())