| Index: Source/core/rendering/RenderFrameSet.cpp
|
| diff --git a/Source/core/rendering/RenderFrameSet.cpp b/Source/core/rendering/RenderFrameSet.cpp
|
| index af14183f61995fb60a201ff92f1955c1118ca2a4..150922a6c2943c409b36f403f5e465b4522a5a6c 100644
|
| --- a/Source/core/rendering/RenderFrameSet.cpp
|
| +++ b/Source/core/rendering/RenderFrameSet.cpp
|
| @@ -80,19 +80,18 @@ void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect
|
| {
|
| if (!paintInfo.rect.intersects(borderRect))
|
| return;
|
| -
|
| +
|
| // FIXME: We should do something clever when borders from distinct framesets meet at a join.
|
| -
|
| +
|
| // Fill first.
|
| GraphicsContext* context = paintInfo.context;
|
| - ColorSpace colorSpace = style()->colorSpace();
|
| - context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
|
| -
|
| + context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor());
|
| +
|
| // Now stroke the edges but only if we have enough room to paint both edges with a little
|
| // bit of the fill color showing through.
|
| if (borderRect.width() >= 3) {
|
| - context->fillRect(IntRect(borderRect.location(), IntSize(1, height())), borderStartEdgeColor(), colorSpace);
|
| - context->fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y()), IntSize(1, height())), borderEndEdgeColor(), colorSpace);
|
| + context->fillRect(IntRect(borderRect.location(), IntSize(1, height())), borderStartEdgeColor());
|
| + context->fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y()), IntSize(1, height())), borderEndEdgeColor());
|
| }
|
| }
|
|
|
| @@ -102,17 +101,16 @@ void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& b
|
| return;
|
|
|
| // FIXME: We should do something clever when borders from distinct framesets meet at a join.
|
| -
|
| +
|
| // Fill first.
|
| GraphicsContext* context = paintInfo.context;
|
| - ColorSpace colorSpace = style()->colorSpace();
|
| - context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
|
| + context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor());
|
|
|
| // Now stroke the edges but only if we have enough room to paint both edges with a little
|
| // bit of the fill color showing through.
|
| if (borderRect.height() >= 3) {
|
| - context->fillRect(IntRect(borderRect.location(), IntSize(width(), 1)), borderStartEdgeColor(), colorSpace);
|
| - context->fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1), IntSize(width(), 1)), borderEndEdgeColor(), colorSpace);
|
| + context->fillRect(IntRect(borderRect.location(), IntSize(width(), 1)), borderStartEdgeColor());
|
| + context->fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1), IntSize(width(), 1)), borderEndEdgeColor());
|
| }
|
| }
|
|
|
|
|