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

Side by Side Diff: trunk/Source/core/svg/SVGFEFloodElement.cpp

Issue 948053002: Revert 190605 "Make RenderObject::style() return a const object" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 5 years, 10 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) 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 21 matching lines...) Expand all
32 : SVGFilterPrimitiveStandardAttributes(SVGNames::feFloodTag, document) 32 : SVGFilterPrimitiveStandardAttributes(SVGNames::feFloodTag, document)
33 { 33 {
34 } 34 }
35 35
36 DEFINE_NODE_FACTORY(SVGFEFloodElement) 36 DEFINE_NODE_FACTORY(SVGFEFloodElement)
37 37
38 bool SVGFEFloodElement::setFilterEffectAttribute(FilterEffect* effect, const Qua lifiedName& attrName) 38 bool SVGFEFloodElement::setFilterEffectAttribute(FilterEffect* effect, const Qua lifiedName& attrName)
39 { 39 {
40 LayoutObject* renderer = this->renderer(); 40 LayoutObject* renderer = this->renderer();
41 ASSERT(renderer); 41 ASSERT(renderer);
42 const LayoutStyle& style = renderer->styleRef(); 42 LayoutStyle* style = renderer->style();
43 ASSERT(style);
43 FEFlood* flood = static_cast<FEFlood*>(effect); 44 FEFlood* flood = static_cast<FEFlood*>(effect);
44 45
45 if (attrName == SVGNames::flood_colorAttr) 46 if (attrName == SVGNames::flood_colorAttr)
46 return flood->setFloodColor(style.svgStyle().floodColor()); 47 return flood->setFloodColor(style->svgStyle().floodColor());
47 if (attrName == SVGNames::flood_opacityAttr) 48 if (attrName == SVGNames::flood_opacityAttr)
48 return flood->setFloodOpacity(style.svgStyle().floodOpacity()); 49 return flood->setFloodOpacity(style->svgStyle().floodOpacity());
49 50
50 ASSERT_NOT_REACHED(); 51 ASSERT_NOT_REACHED();
51 return false; 52 return false;
52 } 53 }
53 54
54 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEFloodElement::build(SVGFilterBuilder*, Filter* filter) 55 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEFloodElement::build(SVGFilterBuilder*, Filter* filter)
55 { 56 {
56 LayoutObject* renderer = this->renderer(); 57 LayoutObject* renderer = this->renderer();
57 if (!renderer) 58 if (!renderer)
58 return nullptr; 59 return nullptr;
59 60
60 ASSERT(renderer->style()); 61 ASSERT(renderer->style());
61 const SVGLayoutStyle& svgStyle = renderer->style()->svgStyle(); 62 const SVGLayoutStyle& svgStyle = renderer->style()->svgStyle();
62 63
63 Color color = svgStyle.floodColor(); 64 Color color = svgStyle.floodColor();
64 float opacity = svgStyle.floodOpacity(); 65 float opacity = svgStyle.floodOpacity();
65 66
66 return FEFlood::create(filter, color, opacity); 67 return FEFlood::create(filter, color, opacity);
67 } 68 }
68 69
69 } 70 }
OLDNEW
« no previous file with comments | « trunk/Source/core/svg/SVGElementRareData.cpp ('k') | trunk/Source/core/svg/SVGGraphicsElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698