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

third_party/WebKit/WebCore/rendering/RenderTableCell.cpp

 /**
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 185 matching lines @@
     RenderBlock::computeAbsoluteRepaintRect(r, fixed);
 }
 
 FloatPoint RenderTableCell::localToAbsolute(FloatPoint localPoint, bool fixed, bool useTransforms) const
 {
     RenderView* v = view();
     if ((!v || !v->layoutState()) && parent()) {
         // 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
 {
     FloatPoint localPoint = RenderBlock::absoluteToLocal(containerPoint, fixed, useTransforms);
     if (parent()) {
         // Rows are in the same coordinate space, so add their offset back in.
         localPoint.move(parent()->xPos(), parent()->yPos());
     }
     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
     // the first in-flow line box in the cell, or the first in-flow table-row in the cell, whichever comes first. If there
     // is no such line box or table-row, the baseline is the bottom of content edge of the cell box.
 
     int firstLineBaseline = getBaselineOfFirstLineBox();
     if (firstLineBaseline != -1)
         return firstLineBaseline;
 
@@ skipping 634 matching lines @@
     int h = height() + borderTopExtra() + borderBottomExtra();
    
     int my = max(ty, paintInfo.rect.y());
     int end = min(paintInfo.rect.bottom(), ty + h);
     int mh = end - my;
 
     paintMaskImages(paintInfo, my, mh, tx, ty, w, h);
 }
 
 } // namespace WebCore