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

third_party/WebKit/WebCore/rendering/RenderTableCell.cpp

Index: third_party/WebKit/WebCore/rendering/RenderTableCell.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderTableCell.cpp	(revision 5296)
+++ third_party/WebKit/WebCore/rendering/RenderTableCell.cpp	(working copy)
@@ -203,7 +203,7 @@
         // Rows are in the same coordinate space, so don't add their offset in.
         localPoint.move(-parent()->xPos(), -parent()->yPos());
     }
-    return RenderBlock::localToAbsolute(localPoint, fixed, useTransforms);;
+    return RenderBlock::localToAbsolute(localPoint, fixed, useTransforms);
 }
 
 FloatPoint RenderTableCell::absoluteToLocal(FloatPoint containerPoint, bool fixed, bool useTransforms) const
@@ -216,6 +216,16 @@
     return localPoint;
 }
 
+FloatQuad RenderTableCell::localToAbsoluteQuad(const FloatQuad& localQuad, bool fixed) const
+{
+    FloatQuad quad = localQuad;
+    if (parent()) {
+        // Rows are in the same coordinate space, so don't add their offset in.
+        quad.move(-parent()->xPos(), -parent()->yPos());
+    }
+    return RenderBlock::localToAbsoluteQuad(quad, fixed);
+}
+
 int RenderTableCell::baselinePosition(bool /*firstLine*/, bool /*isRootLineBox*/) const
 {
     // <http://www.w3.org/TR/2007/CR-CSS21-20070719/tables.html#height-layout>: The baseline of a cell is the baseline of