Index: Source/core/rendering/RenderMultiColumnSet.cpp |
diff --git a/Source/core/rendering/RenderMultiColumnSet.cpp b/Source/core/rendering/RenderMultiColumnSet.cpp |
index 2c0175b79d81dd71525083e8f8386a2c67ea6dd2..bb3f9a4f8761a660f7f3adb411bdf15dfd761b51 100644 |
--- a/Source/core/rendering/RenderMultiColumnSet.cpp |
+++ b/Source/core/rendering/RenderMultiColumnSet.cpp |
@@ -329,7 +329,7 @@ void RenderMultiColumnSet::paintObject(PaintInfo& paintInfo, const LayoutPoint& |
// RenderBlocks do. Note this is a pretty minor issue, since the old column implementation clipped columns |
// anyway, thus making it impossible for them to overlap one another. It's also really unlikely that the columns |
// would overlap another block. |
- if (!m_flowThread || !isValid() || (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseSelection)) |
+ if (!m_flowThread || !isValid() || (paintInfo.getPhase() != PaintPhaseForeground && paintInfo.getPhase() != PaintPhaseSelection)) |
return; |
paintColumnRules(paintInfo, paintOffset); |
@@ -337,7 +337,7 @@ void RenderMultiColumnSet::paintObject(PaintInfo& paintInfo, const LayoutPoint& |
void RenderMultiColumnSet::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& paintOffset) |
{ |
- if (paintInfo.context->paintingDisabled()) |
+ if (paintInfo.getContext()->paintingDisabled()) |
return; |
RenderStyle* blockStyle = toRenderMultiColumnBlock(parent())->style(); |
@@ -354,7 +354,7 @@ void RenderMultiColumnSet::paintColumnRules(PaintInfo& paintInfo, const LayoutPo |
if (colCount <= 1) |
return; |
- bool antialias = shouldAntialiasLines(paintInfo.context); |
+ bool antialias = shouldAntialiasLines(paintInfo.getContext()); |
bool leftToRight = style()->isLeftToRightDirection(); |
LayoutUnit currLogicalLeftOffset = leftToRight ? LayoutUnit() : contentLogicalWidth(); |
@@ -382,7 +382,7 @@ void RenderMultiColumnSet::paintColumnRules(PaintInfo& paintInfo, const LayoutPo |
LayoutUnit ruleTop = isHorizontalWritingMode() ? paintOffset.y() + borderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleThickness / 2 + ruleAdd; |
LayoutUnit ruleBottom = isHorizontalWritingMode() ? ruleTop + contentHeight() : ruleTop + ruleThickness; |
IntRect pixelSnappedRuleRect = pixelSnappedIntRectFromEdges(ruleLeft, ruleTop, ruleRight, ruleBottom); |
- drawLineForBoxSide(paintInfo.context, pixelSnappedRuleRect.x(), pixelSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRuleRect.maxY(), boxSide, ruleColor, ruleStyle, 0, 0, antialias); |
+ drawLineForBoxSide(paintInfo.getContext(), pixelSnappedRuleRect.x(), pixelSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRuleRect.maxY(), boxSide, ruleColor, ruleStyle, 0, 0, antialias); |
} |
ruleLogicalLeft = currLogicalLeftOffset; |