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

third_party/WebKit/WebCore/rendering/RenderSVGText.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2006 Apple Computer, Inc.
  *               2006 Alexander Kellett <lypanov@kde.org>
  *               2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  *               2007 Nikolas Zimmermann <zimmermann@kde.org>
  *               2008 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 146 matching lines @@
  
     // Don't use relativeBBox here, as it's unites the selection rects. Makes it hard
     // to spot errors, if there are any using WebInspector. Individually feed them into 'rects'.
     for (InlineRunBox* runBox = firstLineBox(); runBox; runBox = runBox->nextLineBox()) {
         ASSERT(runBox->isInlineFlowBox());
 
         InlineFlowBox* flowBox = static_cast<InlineFlowBox*>(runBox);
         for (InlineBox* box = flowBox->firstChild(); box; box = box->nextOnLine()) {
             FloatRect boxRect(box->xPos(), box->yPos(), box->width(), box->height());
             boxRect.move(narrowPrecisionToFloat(absPos.x() - htmlParentCtm.e()), narrowPrecisionToFloat(absPos.y() - htmlParentCtm.f()));
+            // FIXME: broken with CSS transforms
             rects.append(enclosingIntRect(absoluteTransform().mapRect(boxRect)));
         }
     }
 }
 
+void RenderSVGText::absoluteQuads(Vector<FloatQuad>& quads, bool topLevel)
+{
+    RenderSVGRoot* root = findSVGRootObject(parent());
+    if (!root)
+        return;
+
+    FloatPoint absPos = localToAbsolute();
+
+    AffineTransform htmlParentCtm = root->RenderContainer::absoluteTransform();
+ 
+    // Don't use relativeBBox here, as it's unites the selection rects. Makes it hard
+    // to spot errors, if there are any using WebInspector. Individually feed them into 'rects'.
+    for (InlineRunBox* runBox = firstLineBox(); runBox; runBox = runBox->nextLineBox()) {
+        ASSERT(runBox->isInlineFlowBox());
+
+        InlineFlowBox* flowBox = static_cast<InlineFlowBox*>(runBox);
+        for (InlineBox* box = flowBox->firstChild(); box; box = box->nextOnLine()) {
+            FloatRect boxRect(box->xPos(), box->yPos(), box->width(), box->height());
+            boxRect.move(narrowPrecisionToFloat(absPos.x() - htmlParentCtm.e()), narrowPrecisionToFloat(absPos.y() - htmlParentCtm.f()));
+            // FIXME: broken with CSS transforms
+            quads.append(absoluteTransform().mapRect(boxRect));
+        }
+    }
+}
+
 void RenderSVGText::paint(PaintInfo& paintInfo, int, int)
 {   
     RenderObject::PaintInfo pi(paintInfo);
     pi.rect = absoluteTransform().inverse().mapRect(pi.rect);
     RenderBlock::paint(pi, 0, 0);
 }
 
 FloatRect RenderSVGText::relativeBBox(bool includeStroke) const
 {
     FloatRect repaintRect;
@@ skipping 25 matching lines @@
 
     repaintRect.move(xPos(), yPos());
     return repaintRect;
 }
 
 }
 
 #endif // ENABLE(SVG)
 
 // vim:ts=4:noet