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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGStopElement.cpp

Issue 2689083004: Don't unconditionally generate a layout object for SVG <stop> elements. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/svg-in-html.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 } 49 }
50 50
51 SVGElement::svgAttributeChanged(attrName); 51 SVGElement::svgAttributeChanged(attrName);
52 } 52 }
53 53
54 LayoutObject* SVGStopElement::createLayoutObject(const ComputedStyle&) { 54 LayoutObject* SVGStopElement::createLayoutObject(const ComputedStyle&) {
55 return new LayoutSVGGradientStop(this); 55 return new LayoutSVGGradientStop(this);
56 } 56 }
57 57
58 bool SVGStopElement::layoutObjectIsNeeded(const ComputedStyle&) { 58 bool SVGStopElement::layoutObjectIsNeeded(const ComputedStyle&) {
59 return true; 59 return isValid() && hasSVGParent();
60 } 60 }
61 61
62 Color SVGStopElement::stopColorIncludingOpacity() const { 62 Color SVGStopElement::stopColorIncludingOpacity() const {
63 const ComputedStyle* style = 63 const ComputedStyle* style =
64 layoutObject() ? layoutObject()->style() : nullptr; 64 layoutObject() ? layoutObject()->style() : nullptr;
65 // FIXME: This check for null style exists to address Bug WK 90814, a rare 65 // FIXME: This check for null style exists to address Bug WK 90814, a rare
66 // crash condition in which the layoutObject or style is null. This entire 66 // crash condition in which the layoutObject or style is null. This entire
67 // class is scheduled for removal (Bug WK 86941) and we will tolerate this 67 // class is scheduled for removal (Bug WK 86941) and we will tolerate this
68 // null check until then. 68 // null check until then.
69 if (!style) 69 if (!style)
70 return Color(Color::transparent); // Transparent black. 70 return Color(Color::transparent); // Transparent black.
71 71
72 const SVGComputedStyle& svgStyle = style->svgStyle(); 72 const SVGComputedStyle& svgStyle = style->svgStyle();
73 return svgStyle.stopColor().combineWithAlpha(svgStyle.stopOpacity()); 73 return svgStyle.stopColor().combineWithAlpha(svgStyle.stopOpacity());
74 } 74 }
75 75
76 } // namespace blink 76 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/svg-in-html.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698