Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(918)

Side by Side Diff: Source/core/rendering/RenderFrameSet.cpp

Issue 19697011: Change rendering code to use RenderObject::resolveColor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /** 1 /**
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect & borderRect) 78 void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect & borderRect)
79 { 79 {
80 if (!paintInfo.rect.intersects(borderRect)) 80 if (!paintInfo.rect.intersects(borderRect))
81 return; 81 return;
82 82
83 // FIXME: We should do something clever when borders from distinct framesets meet at a join. 83 // FIXME: We should do something clever when borders from distinct framesets meet at a join.
84 84
85 // Fill first. 85 // Fill first.
86 GraphicsContext* context = paintInfo.context; 86 GraphicsContext* context = paintInfo.context;
87 context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visite dDependentColor(CSSPropertyBorderLeftColor) : borderFillColor()); 87 context->fillRect(borderRect, frameSet()->hasBorderColor() ? resolveColor(CS SPropertyBorderLeftColor) : borderFillColor());
88 88
89 // Now stroke the edges but only if we have enough room to paint both edges with a little 89 // Now stroke the edges but only if we have enough room to paint both edges with a little
90 // bit of the fill color showing through. 90 // bit of the fill color showing through.
91 if (borderRect.width() >= 3) { 91 if (borderRect.width() >= 3) {
92 context->fillRect(IntRect(borderRect.location(), IntSize(1, height())), borderStartEdgeColor()); 92 context->fillRect(IntRect(borderRect.location(), IntSize(1, height())), borderStartEdgeColor());
93 context->fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y() ), IntSize(1, height())), borderEndEdgeColor()); 93 context->fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y() ), IntSize(1, height())), borderEndEdgeColor());
94 } 94 }
95 } 95 }
96 96
97 void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& b orderRect) 97 void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& b orderRect)
98 { 98 {
99 if (!paintInfo.rect.intersects(borderRect)) 99 if (!paintInfo.rect.intersects(borderRect))
100 return; 100 return;
101 101
102 // FIXME: We should do something clever when borders from distinct framesets meet at a join. 102 // FIXME: We should do something clever when borders from distinct framesets meet at a join.
103 103
104 // Fill first. 104 // Fill first.
105 GraphicsContext* context = paintInfo.context; 105 GraphicsContext* context = paintInfo.context;
106 context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visite dDependentColor(CSSPropertyBorderLeftColor) : borderFillColor()); 106 context->fillRect(borderRect, frameSet()->hasBorderColor() ? resolveColor(CS SPropertyBorderLeftColor) : borderFillColor());
107 107
108 // Now stroke the edges but only if we have enough room to paint both edges with a little 108 // Now stroke the edges but only if we have enough room to paint both edges with a little
109 // bit of the fill color showing through. 109 // bit of the fill color showing through.
110 if (borderRect.height() >= 3) { 110 if (borderRect.height() >= 3) {
111 context->fillRect(IntRect(borderRect.location(), IntSize(width(), 1)), b orderStartEdgeColor()); 111 context->fillRect(IntRect(borderRect.location(), IntSize(width(), 1)), b orderStartEdgeColor());
112 context->fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1 ), IntSize(width(), 1)), borderEndEdgeColor()); 112 context->fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1 ), IntSize(width(), 1)), borderEndEdgeColor());
113 } 113 }
114 } 114 }
115 115
116 void RenderFrameSet::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 116 void RenderFrameSet::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 return SetCursor; 665 return SetCursor;
666 } 666 }
667 if (canResizeColumn(roundedPoint)) { 667 if (canResizeColumn(roundedPoint)) {
668 cursor = columnResizeCursor(); 668 cursor = columnResizeCursor();
669 return SetCursor; 669 return SetCursor;
670 } 670 }
671 return RenderBox::getCursor(point, cursor); 671 return RenderBox::getCursor(point, cursor);
672 } 672 }
673 673
674 } // namespace WebCore 674 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698