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

third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp

Index: third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp	(revision 5296)
+++ third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp	(working copy)
@@ -58,6 +58,11 @@
     rects.append(computeAbsoluteRectForRange(0, textLength()));
 }
 
+void RenderSVGInlineText::absoluteQuads(Vector<FloatQuad>& quads, bool topLevel)
+{
+    quads.append(FloatRect(computeAbsoluteRectForRange(0, textLength())));
+}
+
 IntRect RenderSVGInlineText::selectionRect(bool)
 {
     ASSERT(!needsLayout());
@@ -115,6 +120,7 @@
 
     FloatRect fixedRect(narrowPrecisionToFloat(rect.x() + absPos.x() - xPos() - htmlParentCtm.e()),
                         narrowPrecisionToFloat(rect.y() + absPos.y() - yPos() - htmlParentCtm.f()), rect.width(), rect.height());
+    // FIXME: broken with CSS transforms
     return enclosingIntRect(absoluteTransform().mapRect(fixedRect));
 }