OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde
.org> | 2 * Copyright (C) 2004, 2005, 2006, 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 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 return new (document()->renderArena()) RenderSVGResourcePattern(this); | 175 return new (document()->renderArena()) RenderSVGResourcePattern(this); |
176 } | 176 } |
177 | 177 |
178 void SVGPatternElement::collectPatternAttributes(PatternAttributes& attributes)
const | 178 void SVGPatternElement::collectPatternAttributes(PatternAttributes& attributes)
const |
179 { | 179 { |
180 HashSet<const SVGPatternElement*> processedPatterns; | 180 HashSet<const SVGPatternElement*> processedPatterns; |
181 | 181 |
182 const SVGPatternElement* current = this; | 182 const SVGPatternElement* current = this; |
183 while (current) { | 183 while (current) { |
184 if (!attributes.hasX() && current->hasAttribute(SVGNames::xAttr)) | 184 if (!attributes.hasX() && current->hasAttribute(SVGNames::xAttr)) |
185 attributes.setX(current->x()); | 185 attributes.setX(current->xCurrentValue()); |
186 | 186 |
187 if (!attributes.hasY() && current->hasAttribute(SVGNames::yAttr)) | 187 if (!attributes.hasY() && current->hasAttribute(SVGNames::yAttr)) |
188 attributes.setY(current->y()); | 188 attributes.setY(current->yCurrentValue()); |
189 | 189 |
190 if (!attributes.hasWidth() && current->hasAttribute(SVGNames::widthAttr)
) | 190 if (!attributes.hasWidth() && current->hasAttribute(SVGNames::widthAttr)
) |
191 attributes.setWidth(current->width()); | 191 attributes.setWidth(current->widthCurrentValue()); |
192 | 192 |
193 if (!attributes.hasHeight() && current->hasAttribute(SVGNames::heightAtt
r)) | 193 if (!attributes.hasHeight() && current->hasAttribute(SVGNames::heightAtt
r)) |
194 attributes.setHeight(current->height()); | 194 attributes.setHeight(current->heightCurrentValue()); |
195 | 195 |
196 if (!attributes.hasViewBox() && current->hasAttribute(SVGNames::viewBoxA
ttr) && current->viewBoxIsValid()) | 196 if (!attributes.hasViewBox() && current->hasAttribute(SVGNames::viewBoxA
ttr) && current->viewBoxIsValid()) |
197 attributes.setViewBox(current->viewBox()); | 197 attributes.setViewBox(current->viewBoxCurrentValue()); |
198 | 198 |
199 if (!attributes.hasPreserveAspectRatio() && current->hasAttribute(SVGNam
es::preserveAspectRatioAttr)) | 199 if (!attributes.hasPreserveAspectRatio() && current->hasAttribute(SVGNam
es::preserveAspectRatioAttr)) |
200 attributes.setPreserveAspectRatio(current->preserveAspectRatio()); | 200 attributes.setPreserveAspectRatio(current->preserveAspectRatioCurren
tValue()); |
201 | 201 |
202 if (!attributes.hasPatternUnits() && current->hasAttribute(SVGNames::pat
ternUnitsAttr)) | 202 if (!attributes.hasPatternUnits() && current->hasAttribute(SVGNames::pat
ternUnitsAttr)) |
203 attributes.setPatternUnits(current->patternUnits()); | 203 attributes.setPatternUnits(current->patternUnitsCurrentValue()); |
204 | 204 |
205 if (!attributes.hasPatternContentUnits() && current->hasAttribute(SVGNam
es::patternContentUnitsAttr)) | 205 if (!attributes.hasPatternContentUnits() && current->hasAttribute(SVGNam
es::patternContentUnitsAttr)) |
206 attributes.setPatternContentUnits(current->patternContentUnits()); | 206 attributes.setPatternContentUnits(current->patternContentUnitsCurren
tValue()); |
207 | 207 |
208 if (!attributes.hasPatternTransform() && current->hasAttribute(SVGNames:
:patternTransformAttr)) { | 208 if (!attributes.hasPatternTransform() && current->hasAttribute(SVGNames:
:patternTransformAttr)) { |
209 AffineTransform transform; | 209 AffineTransform transform; |
210 current->patternTransform().concatenate(transform); | 210 current->patternTransformCurrentValue().concatenate(transform); |
211 attributes.setPatternTransform(transform); | 211 attributes.setPatternTransform(transform); |
212 } | 212 } |
213 | 213 |
214 if (!attributes.hasPatternContentElement() && current->childElementCount
()) | 214 if (!attributes.hasPatternContentElement() && current->childElementCount
()) |
215 attributes.setPatternContentElement(current); | 215 attributes.setPatternContentElement(current); |
216 | 216 |
217 processedPatterns.add(current); | 217 processedPatterns.add(current); |
218 | 218 |
219 // Respect xlink:href, take attributes from referenced element | 219 // Respect xlink:href, take attributes from referenced element |
220 Node* refNode = SVGURIReference::targetElementFromIRIString(current->hre
f(), document()); | 220 Node* refNode = SVGURIReference::targetElementFromIRIString(current->hre
fCurrentValue(), document()); |
221 if (refNode && refNode->hasTagName(SVGNames::patternTag)) { | 221 if (refNode && refNode->hasTagName(SVGNames::patternTag)) { |
222 current = static_cast<const SVGPatternElement*>(const_cast<const Nod
e*>(refNode)); | 222 current = static_cast<const SVGPatternElement*>(const_cast<const Nod
e*>(refNode)); |
223 | 223 |
224 // Cycle detection | 224 // Cycle detection |
225 if (processedPatterns.contains(current)) { | 225 if (processedPatterns.contains(current)) { |
226 current = 0; | 226 current = 0; |
227 break; | 227 break; |
228 } | 228 } |
229 } else | 229 } else |
230 current = 0; | 230 current = 0; |
231 } | 231 } |
232 } | 232 } |
233 | 233 |
234 AffineTransform SVGPatternElement::localCoordinateSpaceTransform(SVGLocatable::C
TMScope) const | 234 AffineTransform SVGPatternElement::localCoordinateSpaceTransform(SVGLocatable::C
TMScope) const |
235 { | 235 { |
236 AffineTransform matrix; | 236 AffineTransform matrix; |
237 patternTransform().concatenate(matrix); | 237 patternTransformCurrentValue().concatenate(matrix); |
238 return matrix; | 238 return matrix; |
239 } | 239 } |
240 | 240 |
241 bool SVGPatternElement::selfHasRelativeLengths() const | 241 bool SVGPatternElement::selfHasRelativeLengths() const |
242 { | 242 { |
243 return x().isRelative() | 243 return xCurrentValue().isRelative() |
244 || y().isRelative() | 244 || yCurrentValue().isRelative() |
245 || width().isRelative() | 245 || widthCurrentValue().isRelative() |
246 || height().isRelative(); | 246 || heightCurrentValue().isRelative(); |
247 } | 247 } |
248 | 248 |
249 } | 249 } |
OLD | NEW |