Revert the merge. Mac build is mysteriously broken.

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 135 matching lines @@
 {
     return RenderBlock::paddingBottom() + (includeIntrinsicPadding ? intrinsicPaddingBottom() : 0);
 }
 
 void RenderTableCell::setOverrideSize(int size)
 {
     clearIntrinsicPadding();
     RenderBlock::setOverrideSize(size);
 }
 
-IntRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer)
+IntRect RenderTableCell::clippedOverflowRectForRepaint(RenderBox* repaintContainer)
 {
     // If the table grid is dirty, we cannot get reliable information about adjoining cells,
     // so we ignore outside borders. This should not be a problem because it means that
     // the table is going to recalculate the grid, relayout and repaint its current rect, which
     // includes any outside borders of this cell.
     if (!table()->collapseBorders() || table()->needsSectionRecalc())
         return RenderBlock::clippedOverflowRectForRepaint(repaintContainer);
 
     bool rtl = table()->style()->direction() == RTL;
     int outlineSize = style()->outlineSize();
@@ skipping 31 matching lines @@
 
     if (RenderView* v = view()) {
         // FIXME: layoutDelta needs to be applied in parts before/after transforms and
         // repaint containers. https://bugs.webkit.org/show_bug.cgi?id=23308
         r.move(v->layoutDelta());
     }
     computeRectForRepaint(repaintContainer, r);
     return r;
 }
 
-void RenderTableCell::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& r, bool fixed)
+void RenderTableCell::computeRectForRepaint(RenderBox* repaintContainer, IntRect& r, bool fixed)
 {
     if (repaintContainer == this)
         return;
     r.setY(r.y());
     RenderView* v = view();
     if ((!v || !v->layoutStateEnabled()) && parent())
         r.move(-parentBox()->x(), -parentBox()->y()); // Rows are in the same coordinate space, so don't add their offset in.
     RenderBlock::computeRectForRepaint(repaintContainer, r, fixed);
 }
 
@@ skipping 10 matching lines @@
 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(parentBox()->x(), parentBox()->y());
     }
     return localPoint;
 }
 
-FloatQuad RenderTableCell::localToContainerQuad(const FloatQuad& localQuad, RenderBoxModelObject* repaintContainer, bool fixed) const
+FloatQuad RenderTableCell::localToContainerQuad(const FloatQuad& localQuad, RenderBox* repaintContainer, bool fixed) const
 {
     if (repaintContainer == this)
         return localQuad;
 
     FloatQuad quad = localQuad;
     if (parent()) {
         // Rows are in the same coordinate space, so don't add their offset in.
         quad.move(-parentBox()->x(), -parentBox()->y());
     }
     return RenderBlock::localToContainerQuad(quad, repaintContainer, fixed);
@@ skipping 635 matching lines @@
     int h = height();
    
     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