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

third_party/WebKit/WebCore/rendering/RenderInline.cpp

 /*
  * This file is part of the render object implementation for KHTML.
  *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 283 matching lines @@
             curr->absoluteRects(rects, tx + curr->xPos(), ty + curr->yPos(), false);
     }
 
     if (continuation() && topLevel)
         continuation()->absoluteRects(rects, 
                                       tx - containingBlock()->xPos() + continuation()->xPos(),
                                       ty - containingBlock()->yPos() + continuation()->yPos(),
                                       topLevel);
 }
 
+void RenderInline::absoluteQuads(Vector<FloatQuad>& quads, bool topLevel)
+{
+    for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) {
+        FloatRect localRect(curr->xPos(), curr->yPos(), curr->width(), curr->height());
+        quads.append(localToAbsoluteQuad(localRect));
+    }
+    
+    for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
+        if (!curr->isText())
+            curr->absoluteQuads(quads, false);
+    }
+
+    if (continuation() && topLevel)
+        continuation()->absoluteQuads(quads, topLevel);
+}
+
 bool RenderInline::requiresLayer()
 {
     return isRelPositioned() || isTransparent() || hasMask();
 }
 
 int RenderInline::width() const
 {
     // Return the width of the minimal left side and the maximal right side.
     int leftSide = 0;
     int rightSide = 0;
@@ skipping 60 matching lines @@
         if (c->isInline())
             contBlock = c->containingBlock();
         if (c->isInline() || c->firstChild())
             return c->positionForCoordinates(parentBlockX - contBlock->xPos(), parentBlockY - contBlock->yPos());
     }
 
     return RenderFlow::positionForCoordinates(x, y);
 }
 
 } // namespace WebCore