WebKit merge 40668:40722 part 1.

third_party/WebKit/WebCore/rendering/RenderTableCell.cpp

Index: third_party/WebKit/WebCore/rendering/RenderTableCell.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderTableCell.cpp	(revision 9310)
+++ third_party/WebKit/WebCore/rendering/RenderTableCell.cpp	(working copy)
@@ -153,7 +153,7 @@
     RenderBlock::setOverrideSize(size);
 }
 
-IntRect RenderTableCell::clippedOverflowRectForRepaint(RenderBox* repaintContainer)
+IntRect RenderTableCell::clippedOverflowRectForRepaint(RenderBoxModelObject* 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
@@ -205,7 +205,7 @@
     return r;
 }
 
-void RenderTableCell::computeRectForRepaint(RenderBox* repaintContainer, IntRect& r, bool fixed)
+void RenderTableCell::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& r, bool fixed)
 {
     if (repaintContainer == this)
         return;
@@ -236,7 +236,7 @@
     return localPoint;
 }
 
-FloatQuad RenderTableCell::localToContainerQuad(const FloatQuad& localQuad, RenderBox* repaintContainer, bool fixed) const
+FloatQuad RenderTableCell::localToContainerQuad(const FloatQuad& localQuad, RenderBoxModelObject* repaintContainer, bool fixed) const
 {
     if (repaintContainer == this)
         return localQuad;