Do another merge using nifty new merge script (CL for that coming soon).

third_party/WebKit/WebCore/rendering/RenderSVGImage.cpp

 /*
     Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
     Copyright (C) 2006 Apple Computer, Inc.
     Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
     Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
 
     This file is part of the WebKit project
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 219 matching lines @@
 void RenderSVGImage::imageChanged(WrappedImagePtr image)
 {
     RenderImage::imageChanged(image);
 
     // We override to invalidate a larger rect, since SVG images can draw outside their "bounds"
     repaintRectangle(absoluteClippedOverflowRect());
 }
 
 void RenderSVGImage::calculateAbsoluteBounds()
 {
+    // FIXME: broken with CSS transforms
     FloatRect absoluteRect = absoluteTransform().mapRect(relativeBBox(true));
 
 #if ENABLE(SVG_FILTERS)
     // Filters can expand the bounding box
     SVGResourceFilter* filter = getFilterById(document(), style()->svgStyle()->filter());
     if (filter)
         absoluteRect.unite(filter->filterBBoxForItemBBox(absoluteRect));
 #endif
 
     if (!absoluteRect.isEmpty())
@@ skipping 12 matching lines @@
     // this is called from paint() after the localTransform has already been applied
     IntRect contentRect = enclosingIntRect(relativeBBox());
     graphicsContext->addFocusRingRect(contentRect);
 }
 
 void RenderSVGImage::absoluteRects(Vector<IntRect>& rects, int, int, bool)
 {
     rects.append(absoluteClippedOverflowRect());
 }
 
+void RenderSVGImage::absoluteQuads(Vector<FloatQuad>& quads, bool topLevel)
+{
+    quads.append(FloatRect(absoluteClippedOverflowRect()));
+}
+
 }
 
 #endif // ENABLE(SVG)