Commit 99324a12 authored by hyatt's avatar hyatt

Change the frameborder color to be light gray for framesets.

        Reviewed by aroben

        * rendering/RenderFrameSet.cpp:
        (WebCore::borderFillColor):
        (WebCore::RenderFrameSet::paintColumnBorder):
        (WebCore::RenderFrameSet::paintRowBorder):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@20288 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 51781d7a
2007-03-18 David Hyatt <hyatt@apple.com>
Change the frameborder color to be light gray for framesets.
Reviewed by aroben
* rendering/RenderFrameSet.cpp:
(WebCore::borderFillColor):
(WebCore::RenderFrameSet::paintColumnBorder):
(WebCore::RenderFrameSet::paintRowBorder):
2007-03-18 David Hyatt <hyatt@apple.com> 2007-03-18 David Hyatt <hyatt@apple.com>
Make iframes work properly with frameborder="0". Make iframes work properly with frameborder="0".
......
...@@ -76,6 +76,11 @@ static Color borderEndEdgeColor() ...@@ -76,6 +76,11 @@ static Color borderEndEdgeColor()
return Color::black; return Color::black;
} }
static Color borderFillColor()
{
return Color(208, 208, 208);
}
void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect& borderRect) void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
{ {
if (!paintInfo.rect.intersects(borderRect)) if (!paintInfo.rect.intersects(borderRect))
...@@ -85,7 +90,7 @@ void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect ...@@ -85,7 +90,7 @@ void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect
// Fill first. // Fill first.
GraphicsContext* context = paintInfo.context; GraphicsContext* context = paintInfo.context;
context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->borderLeftColor() : Color::white); context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->borderLeftColor() : borderFillColor());
// Now stroke the edges but only if we have enough room to paint both edges with a little // 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. // bit of the fill color showing through.
...@@ -107,7 +112,7 @@ void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& b ...@@ -107,7 +112,7 @@ void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& b
// Fill first. // Fill first.
GraphicsContext* context = paintInfo.context; GraphicsContext* context = paintInfo.context;
context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->borderLeftColor() : Color::white); context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->borderLeftColor() : borderFillColor());
// Now stroke the edges but only if we have enough room to paint both edges with a little // 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. // bit of the fill color showing through.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment