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

third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  *           (C) 2006 Apple Computer Inc.
  *           (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  *           (C) 2008 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 40 matching lines @@
 RenderSVGInlineText::RenderSVGInlineText(Node* n, PassRefPtr<StringImpl> str) 
     : RenderText(n, str)
 {
 }
 
 void RenderSVGInlineText::absoluteRects(Vector<IntRect>& rects, int, int, bool)
 {
     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());
 
     IntRect rect;
     if (selectionState() == SelectionNone)
         return rect;
 
     // Early exit if we're ie. a <text> within a <defs> section.
     if (isChildOfHiddenContainer(this))
@@ skipping 37 matching lines @@
 
     // Mimic RenderBox::computeAbsoluteRepaintRect() functionality. But only the subset needed for SVG and respecting SVG transformations.
     FloatPoint absPos = cb->container()->localToAbsolute();
 
     // Remove HTML parent translation offsets here! These need to be retrieved from the RenderSVGRoot object.
     // But do take the containingBlocks's container position into account, ie. SVG text in scrollable <div>.
     AffineTransform htmlParentCtm = root->RenderContainer::absoluteTransform();
 
     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));
 }
 
 InlineTextBox* RenderSVGInlineText::createInlineTextBox()
 {
     return new (renderArena()) SVGInlineTextBox(this);
 }
 
 IntRect RenderSVGInlineText::caretRect(InlineBox* inlineBox, int caretOffset, int* extraWidthToEndOfLine)
 {
@@ skipping 37 matching lines @@
     if (!documentBeingDestroyed()) {
         setNeedsLayoutAndPrefWidthsRecalc();
         repaint();
     }
     RenderText::destroy();
 }
 
 }
 
 #endif // ENABLE(SVG)