OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann | 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann |
3 * <zimmermann@kde.org> | 3 * <zimmermann@kde.org> |
4 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> | 4 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> |
5 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. | 5 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. |
6 * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved. | 6 * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved. |
7 * Copyright (C) 2012 University of Szeged | 7 * Copyright (C) 2012 University of Szeged |
8 * Copyright (C) 2012 Renata Hodovan <reni@webkit.org> | 8 * Copyright (C) 2012 Renata Hodovan <reni@webkit.org> |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 ? AtomicString(use.height()->currentValue()->valueAsString()) | 173 ? AtomicString(use.height()->currentValue()->valueAsString()) |
174 : originalElement.getAttribute(SVGNames::heightAttr)); | 174 : originalElement.getAttribute(SVGNames::heightAttr)); |
175 } | 175 } |
176 } | 176 } |
177 | 177 |
178 void SVGUseElement::collectStyleForPresentationAttribute( | 178 void SVGUseElement::collectStyleForPresentationAttribute( |
179 const QualifiedName& name, | 179 const QualifiedName& name, |
180 const AtomicString& value, | 180 const AtomicString& value, |
181 MutableStylePropertySet* style) { | 181 MutableStylePropertySet* style) { |
182 SVGAnimatedPropertyBase* property = propertyFromAttribute(name); | 182 SVGAnimatedPropertyBase* property = propertyFromAttribute(name); |
183 if (property == m_x) | 183 if (property == m_x) { |
184 addPropertyToPresentationAttributeStyle( | 184 addPropertyToPresentationAttributeStyle(style, CSSPropertyX, |
185 style, CSSPropertyX, m_x->currentValue()->asCSSPrimitiveValue()); | 185 m_x->cssValue()); |
186 else if (property == m_y) | 186 } else if (property == m_y) { |
187 addPropertyToPresentationAttributeStyle( | 187 addPropertyToPresentationAttributeStyle(style, CSSPropertyY, |
188 style, CSSPropertyY, m_y->currentValue()->asCSSPrimitiveValue()); | 188 m_y->cssValue()); |
189 else | 189 } else { |
190 SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, | 190 SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, |
191 style); | 191 style); |
| 192 } |
192 } | 193 } |
193 | 194 |
194 bool SVGUseElement::isStructurallyExternal() const { | 195 bool SVGUseElement::isStructurallyExternal() const { |
195 return !m_elementIdentifierIsLocal; | 196 return !m_elementIdentifierIsLocal; |
196 } | 197 } |
197 | 198 |
198 void SVGUseElement::updateTargetReference() { | 199 void SVGUseElement::updateTargetReference() { |
199 SVGURLReferenceResolver resolver(hrefString(), document()); | 200 SVGURLReferenceResolver resolver(hrefString(), document()); |
200 m_elementIdentifier = resolver.fragmentIdentifier(); | 201 m_elementIdentifier = resolver.fragmentIdentifier(); |
201 m_elementIdentifierIsLocal = resolver.isLocal(); | 202 m_elementIdentifierIsLocal = resolver.isLocal(); |
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
731 | 732 |
732 if (m_resource) | 733 if (m_resource) |
733 m_resource->removeClient(this); | 734 m_resource->removeClient(this); |
734 | 735 |
735 m_resource = resource; | 736 m_resource = resource; |
736 if (m_resource) | 737 if (m_resource) |
737 m_resource->addClient(this); | 738 m_resource->addClient(this); |
738 } | 739 } |
739 | 740 |
740 } // namespace blink | 741 } // namespace blink |
OLD | NEW |