| Index: Source/core/rendering/RenderFrameSet.cpp
|
| diff --git a/Source/core/rendering/RenderFrameSet.cpp b/Source/core/rendering/RenderFrameSet.cpp
|
| index 5849e1437ff608465e7b62525c3f44eb7b3d12da..c4f12f2c0600a5ef4f8ab039caf5468668ddfb8d 100644
|
| --- a/Source/core/rendering/RenderFrameSet.cpp
|
| +++ b/Source/core/rendering/RenderFrameSet.cpp
|
| @@ -76,15 +76,15 @@ static Color borderFillColor()
|
| return Color(208, 208, 208);
|
| }
|
|
|
| -void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
|
| +void RenderFrameSet::paintColumnBorder(PaintInfo& paintInfo, const IntRect& borderRect)
|
| {
|
| - if (!paintInfo.rect.intersects(borderRect))
|
| + if (!paintInfo.getRect().intersects(borderRect))
|
| return;
|
|
|
| // FIXME: We should do something clever when borders from distinct framesets meet at a join.
|
|
|
| // Fill first.
|
| - GraphicsContext* context = paintInfo.context;
|
| + GraphicsContext* context = paintInfo.getContext();
|
| context->fillRect(borderRect, frameSet()->hasBorderColor() ? resolveColor(CSSPropertyBorderLeftColor) : borderFillColor());
|
|
|
| // Now stroke the edges but only if we have enough room to paint both edges with a little
|
| @@ -95,15 +95,15 @@ void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect
|
| }
|
| }
|
|
|
| -void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
|
| +void RenderFrameSet::paintRowBorder(PaintInfo& paintInfo, const IntRect& borderRect)
|
| {
|
| - if (!paintInfo.rect.intersects(borderRect))
|
| + if (!paintInfo.getRect().intersects(borderRect))
|
| return;
|
|
|
| // FIXME: We should do something clever when borders from distinct framesets meet at a join.
|
|
|
| // Fill first.
|
| - GraphicsContext* context = paintInfo.context;
|
| + GraphicsContext* context = paintInfo.getContext();
|
| context->fillRect(borderRect, frameSet()->hasBorderColor() ? resolveColor(CSSPropertyBorderLeftColor) : borderFillColor());
|
|
|
| // Now stroke the edges but only if we have enough room to paint both edges with a little
|
| @@ -118,7 +118,7 @@ void RenderFrameSet::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| {
|
| ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this);
|
|
|
| - if (paintInfo.phase != PaintPhaseForeground)
|
| + if (paintInfo.getPhase() != PaintPhaseForeground)
|
| return;
|
|
|
| RenderObject* child = firstChild();
|
|
|