| Index: Source/core/rendering/RenderTableCell.cpp
|
| diff --git a/Source/core/rendering/RenderTableCell.cpp b/Source/core/rendering/RenderTableCell.cpp
|
| index b612c2077be9f6b7d9db0bf87d1c94a7af4dcc65..0194d79c46b55a7ee76d6d02144b65209245c755 100644
|
| --- a/Source/core/rendering/RenderTableCell.cpp
|
| +++ b/Source/core/rendering/RenderTableCell.cpp
|
| @@ -985,7 +985,7 @@ int RenderTableCell::borderHalfAfter(bool outer) const
|
|
|
| void RenderTableCell::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| {
|
| - ASSERT(paintInfo.phase != PaintPhaseCollapsedTableBorders);
|
| + ASSERT(paintInfo.getPhase() != PaintPhaseCollapsedTableBorders);
|
| RenderBlock::paint(paintInfo, paintOffset);
|
| }
|
|
|
| @@ -1085,13 +1085,13 @@ void RenderTableCell::sortBorderValues(RenderTable::CollapsedBorderValues& borde
|
|
|
| void RenderTableCell::paintCollapsedBorders(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| {
|
| - ASSERT(paintInfo.phase == PaintPhaseCollapsedTableBorders);
|
| + ASSERT(paintInfo.getPhase() == PaintPhaseCollapsedTableBorders);
|
|
|
| if (!paintInfo.shouldPaintWithinRoot(this) || style()->visibility() != VISIBLE)
|
| return;
|
|
|
| - LayoutRect localRepaintRect = paintInfo.rect;
|
| - localRepaintRect.inflate(maximalOutlineSize(paintInfo.phase));
|
| + LayoutRect localRepaintRect = paintInfo.getRect();
|
| + localRepaintRect.inflate(maximalOutlineSize(paintInfo.getPhase()));
|
|
|
| LayoutRect paintRect = LayoutRect(paintOffset + location(), pixelSnappedSize());
|
| if (paintRect.y() - table()->outerBorderTop() >= localRepaintRect.maxY())
|
| @@ -1100,7 +1100,7 @@ void RenderTableCell::paintCollapsedBorders(PaintInfo& paintInfo, const LayoutPo
|
| if (paintRect.maxY() + table()->outerBorderBottom() <= localRepaintRect.y())
|
| return;
|
|
|
| - GraphicsContext* graphicsContext = paintInfo.context;
|
| + GraphicsContext* graphicsContext = paintInfo.getContext();
|
| if (!table()->currentBorderValue() || graphicsContext->paintingDisabled())
|
| return;
|
|
|
| @@ -1175,11 +1175,11 @@ void RenderTableCell::paintBackgroundsBehindCell(PaintInfo& paintInfo, const Lay
|
| // We have to clip here because the background would paint
|
| // on top of the borders otherwise. This only matters for cells and rows.
|
| bool shouldClip = backgroundObject->hasLayer() && (backgroundObject == this || backgroundObject == parent()) && tableElt->collapseBorders();
|
| - GraphicsContextStateSaver stateSaver(*paintInfo.context, shouldClip);
|
| + GraphicsContextStateSaver stateSaver(*(paintInfo.getContext()), shouldClip);
|
| if (shouldClip) {
|
| LayoutRect clipRect(adjustedPaintOffset.x() + borderLeft(), adjustedPaintOffset.y() + borderTop(),
|
| width() - borderLeft() - borderRight(), height() - borderTop() - borderBottom());
|
| - paintInfo.context->clip(clipRect);
|
| + paintInfo.getContext()->clip(clipRect);
|
| }
|
| paintFillLayers(paintInfo, c.color(), bgLayer, LayoutRect(adjustedPaintOffset, pixelSnappedSize()), BackgroundBleedNone, CompositeSourceOver, backgroundObject);
|
| }
|
| @@ -1210,7 +1210,7 @@ void RenderTableCell::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoin
|
|
|
| void RenderTableCell::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| {
|
| - if (style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask)
|
| + if (style()->visibility() != VISIBLE || paintInfo.getPhase() != PaintPhaseMask)
|
| return;
|
|
|
| RenderTable* tableElt = table();
|
|
|