| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2007, 2008 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2007, 2008 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 return flood->setFloodColor(style.svgStyle().floodColor()); | 46 return flood->setFloodColor(style.svgStyle().floodColor()); |
| 47 if (attrName == SVGNames::flood_opacityAttr) | 47 if (attrName == SVGNames::flood_opacityAttr) |
| 48 return flood->setFloodOpacity(style.svgStyle().floodOpacity()); | 48 return flood->setFloodOpacity(style.svgStyle().floodOpacity()); |
| 49 | 49 |
| 50 ASSERT_NOT_REACHED(); | 50 ASSERT_NOT_REACHED(); |
| 51 return false; | 51 return false; |
| 52 } | 52 } |
| 53 | 53 |
| 54 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEFloodElement::build(SVGFilterBuilder*,
Filter* filter) | 54 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEFloodElement::build(SVGFilterBuilder*,
Filter* filter) |
| 55 { | 55 { |
| 56 LayoutObject* layoutObject = this->layoutObject(); | 56 Color color = Color::black; |
| 57 if (!layoutObject) | 57 float opacity = 1; |
| 58 return nullptr; | 58 if (LayoutObject* layoutObject = this->layoutObject()) { |
| 59 ASSERT(layoutObject->style()); |
| 60 const SVGComputedStyle& svgStyle = layoutObject->styleRef().svgStyle(); |
| 59 | 61 |
| 60 ASSERT(layoutObject->style()); | 62 color = svgStyle.floodColor(); |
| 61 const SVGComputedStyle& svgStyle = layoutObject->style()->svgStyle(); | 63 opacity = svgStyle.floodOpacity(); |
| 62 | 64 } |
| 63 Color color = svgStyle.floodColor(); | |
| 64 float opacity = svgStyle.floodOpacity(); | |
| 65 | |
| 66 return FEFlood::create(filter, color, opacity); | 65 return FEFlood::create(filter, color, opacity); |
| 67 } | 66 } |
| 68 | 67 |
| 69 } | 68 } |
| OLD | NEW |