| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2006, 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 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> | 4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> |
| 5 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> | 5 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 { | 90 { |
| 91 if (!isSupportedAttribute(attrName)) { | 91 if (!isSupportedAttribute(attrName)) { |
| 92 SVGGradientElement::svgAttributeChanged(attrName); | 92 SVGGradientElement::svgAttributeChanged(attrName); |
| 93 return; | 93 return; |
| 94 } | 94 } |
| 95 | 95 |
| 96 SVGElement::InvalidationGuard invalidationGuard(this); | 96 SVGElement::InvalidationGuard invalidationGuard(this); |
| 97 | 97 |
| 98 updateRelativeLengthsInformation(); | 98 updateRelativeLengthsInformation(); |
| 99 | 99 |
| 100 LayoutSVGResourceContainer* renderer = toLayoutSVGResourceContainer(this->re
nderer()); | 100 LayoutSVGResourceContainer* renderer = toLayoutSVGResourceContainer(this->la
youtObject()); |
| 101 if (renderer) | 101 if (renderer) |
| 102 renderer->invalidateCacheAndMarkForLayout(); | 102 renderer->invalidateCacheAndMarkForLayout(); |
| 103 } | 103 } |
| 104 | 104 |
| 105 LayoutObject* SVGRadialGradientElement::createLayoutObject(const LayoutStyle&) | 105 LayoutObject* SVGRadialGradientElement::createLayoutObject(const LayoutStyle&) |
| 106 { | 106 { |
| 107 return new LayoutSVGResourceRadialGradient(this); | 107 return new LayoutSVGResourceRadialGradient(this); |
| 108 } | 108 } |
| 109 | 109 |
| 110 static void setGradientAttributes(SVGGradientElement* element, RadialGradientAtt
ributes& attributes, bool isRadial = true) | 110 static void setGradientAttributes(SVGGradientElement* element, RadialGradientAtt
ributes& attributes, bool isRadial = true) |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 if (!attributes.hasFy() && radial->fy()->isSpecified()) | 145 if (!attributes.hasFy() && radial->fy()->isSpecified()) |
| 146 attributes.setFy(radial->fy()->currentValue()); | 146 attributes.setFy(radial->fy()->currentValue()); |
| 147 | 147 |
| 148 if (!attributes.hasFr() && radial->fr()->isSpecified()) | 148 if (!attributes.hasFr() && radial->fr()->isSpecified()) |
| 149 attributes.setFr(radial->fr()->currentValue()); | 149 attributes.setFr(radial->fr()->currentValue()); |
| 150 } | 150 } |
| 151 } | 151 } |
| 152 | 152 |
| 153 bool SVGRadialGradientElement::collectGradientAttributes(RadialGradientAttribute
s& attributes) | 153 bool SVGRadialGradientElement::collectGradientAttributes(RadialGradientAttribute
s& attributes) |
| 154 { | 154 { |
| 155 if (!renderer()) | 155 if (!layoutObject()) |
| 156 return false; | 156 return false; |
| 157 | 157 |
| 158 WillBeHeapHashSet<RawPtrWillBeMember<SVGGradientElement>> processedGradients
; | 158 WillBeHeapHashSet<RawPtrWillBeMember<SVGGradientElement>> processedGradients
; |
| 159 SVGGradientElement* current = this; | 159 SVGGradientElement* current = this; |
| 160 | 160 |
| 161 setGradientAttributes(current, attributes); | 161 setGradientAttributes(current, attributes); |
| 162 processedGradients.add(current); | 162 processedGradients.add(current); |
| 163 | 163 |
| 164 while (true) { | 164 while (true) { |
| 165 // Respect xlink:href, take attributes from referenced element | 165 // Respect xlink:href, take attributes from referenced element |
| 166 Node* refNode = SVGURIReference::targetElementFromIRIString(current->hre
f()->currentValue()->value(), treeScope()); | 166 Node* refNode = SVGURIReference::targetElementFromIRIString(current->hre
f()->currentValue()->value(), treeScope()); |
| 167 if (refNode && isSVGGradientElement(*refNode)) { | 167 if (refNode && isSVGGradientElement(*refNode)) { |
| 168 current = toSVGGradientElement(refNode); | 168 current = toSVGGradientElement(refNode); |
| 169 | 169 |
| 170 // Cycle detection | 170 // Cycle detection |
| 171 if (processedGradients.contains(current)) | 171 if (processedGradients.contains(current)) |
| 172 break; | 172 break; |
| 173 | 173 |
| 174 if (!current->renderer()) | 174 if (!current->layoutObject()) |
| 175 return false; | 175 return false; |
| 176 | 176 |
| 177 setGradientAttributes(current, attributes, isSVGRadialGradientElemen
t(*current)); | 177 setGradientAttributes(current, attributes, isSVGRadialGradientElemen
t(*current)); |
| 178 processedGradients.add(current); | 178 processedGradients.add(current); |
| 179 } else { | 179 } else { |
| 180 break; | 180 break; |
| 181 } | 181 } |
| 182 } | 182 } |
| 183 | 183 |
| 184 // Handle default values for fx/fy | 184 // Handle default values for fx/fy |
| (...skipping 10 matching lines...) Expand all Loading... |
| 195 { | 195 { |
| 196 return m_cx->currentValue()->isRelative() | 196 return m_cx->currentValue()->isRelative() |
| 197 || m_cy->currentValue()->isRelative() | 197 || m_cy->currentValue()->isRelative() |
| 198 || m_r->currentValue()->isRelative() | 198 || m_r->currentValue()->isRelative() |
| 199 || m_fx->currentValue()->isRelative() | 199 || m_fx->currentValue()->isRelative() |
| 200 || m_fy->currentValue()->isRelative() | 200 || m_fy->currentValue()->isRelative() |
| 201 || m_fr->currentValue()->isRelative(); | 201 || m_fr->currentValue()->isRelative(); |
| 202 } | 202 } |
| 203 | 203 |
| 204 } // namespace blink | 204 } // namespace blink |
| OLD | NEW |