OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 Color SVGStopElement::stopColorIncludingOpacity() const | 108 Color SVGStopElement::stopColorIncludingOpacity() const |
109 { | 109 { |
110 RenderStyle* style = renderer() ? renderer()->style() : 0; | 110 RenderStyle* style = renderer() ? renderer()->style() : 0; |
111 // FIXME: This check for null style exists to address Bug WK 90814, a rare c
rash condition in | 111 // FIXME: This check for null style exists to address Bug WK 90814, a rare c
rash condition in |
112 // which the renderer or style is null. This entire class is scheduled for r
emoval (Bug WK 86941) | 112 // which the renderer or style is null. This entire class is scheduled for r
emoval (Bug WK 86941) |
113 // and we will tolerate this null check until then. | 113 // and we will tolerate this null check until then. |
114 if (!style || !style->svgStyle()) | 114 if (!style || !style->svgStyle()) |
115 return Color(Color::transparent, true); // Transparent black. | 115 return Color(Color::transparent, true); // Transparent black. |
116 | 116 |
117 const SVGRenderStyle* svgStyle = style->svgStyle(); | 117 const SVGRenderStyle* svgStyle = style->svgStyle(); |
118 return colorWithOverrideAlpha(svgStyle->stopColor().rgb(), svgStyle->stopOpa
city()); | 118 return svgStyle->stopColor().combineWithAlpha(svgStyle->stopOpacity()); |
119 } | 119 } |
120 | 120 |
121 } | 121 } |
OLD | NEW |