| Index: Source/core/rendering/RenderTable.cpp
|
| diff --git a/Source/core/rendering/RenderTable.cpp b/Source/core/rendering/RenderTable.cpp
|
| index f086f2a1e7a84bc24130a41fa446f410db9250c9..63bbff9832f82bfd01dbf0c1d3c6289d7d2023c5 100644
|
| --- a/Source/core/rendering/RenderTable.cpp
|
| +++ b/Source/core/rendering/RenderTable.cpp
|
| @@ -626,14 +626,14 @@ void RenderTable::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
|
|
| LayoutPoint adjustedPaintOffset = paintOffset + location();
|
|
|
| - PaintPhase paintPhase = paintInfo.phase;
|
| + PaintPhase paintPhase = paintInfo.getPhase();
|
|
|
| if (!isRoot()) {
|
| LayoutRect overflowBox = visualOverflowRect();
|
| flipForWritingMode(overflowBox);
|
| - overflowBox.inflate(maximalOutlineSize(paintInfo.phase));
|
| + overflowBox.inflate(maximalOutlineSize(paintInfo.getPhase()));
|
| overflowBox.moveBy(adjustedPaintOffset);
|
| - if (!overflowBox.intersects(paintInfo.rect))
|
| + if (!overflowBox.intersects(paintInfo.getRect()))
|
| return;
|
| }
|
|
|
| @@ -645,7 +645,7 @@ void RenderTable::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
|
|
| void RenderTable::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| {
|
| - PaintPhase paintPhase = paintInfo.phase;
|
| + PaintPhase paintPhase = paintInfo.getPhase();
|
| if ((paintPhase == PaintPhaseBlockBackground || paintPhase == PaintPhaseChildBlockBackground) && hasBoxDecorations() && style()->visibility() == VISIBLE)
|
| paintBoxDecorations(paintInfo, paintOffset);
|
|
|
| @@ -663,7 +663,7 @@ void RenderTable::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffs
|
| paintPhase = PaintPhaseChildBlockBackground;
|
|
|
| PaintInfo info(paintInfo);
|
| - info.phase = paintPhase;
|
| + info.setPhase(paintPhase);
|
| info.updatePaintingRootForChildren(this);
|
|
|
| for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
|
| @@ -677,7 +677,7 @@ void RenderTable::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffs
|
| recalcCollapsedBorders();
|
| // Using our cached sorted styles, we then do individual passes,
|
| // painting each style of border from lowest precedence to highest precedence.
|
| - info.phase = PaintPhaseCollapsedTableBorders;
|
| + info.setPhase(PaintPhaseCollapsedTableBorders);
|
| size_t count = m_collapsedBorders.size();
|
| for (size_t i = 0; i < count; ++i) {
|
| m_currentBorder = &m_collapsedBorders[i];
|
| @@ -719,7 +719,7 @@ void RenderTable::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint& p
|
| LayoutRect rect(paintOffset, size());
|
| subtractCaptionRect(rect);
|
|
|
| - BackgroundBleedAvoidance bleedAvoidance = determineBackgroundBleedAvoidance(paintInfo.context);
|
| + BackgroundBleedAvoidance bleedAvoidance = determineBackgroundBleedAvoidance(paintInfo.getContext());
|
| if (!boxShadowShouldBeAppliedToBackground(bleedAvoidance))
|
| paintBoxShadow(paintInfo, rect, style(), Normal);
|
| paintBackground(paintInfo, rect, bleedAvoidance);
|
| @@ -731,7 +731,7 @@ void RenderTable::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint& p
|
|
|
| void RenderTable::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| {
|
| - if (style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask)
|
| + if (style()->visibility() != VISIBLE || paintInfo.getPhase() != PaintPhaseMask)
|
| return;
|
|
|
| LayoutRect rect(paintOffset, size());
|
|
|