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, 2008, 2009 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rob Buis <buis@kde.org> |
4 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> | 4 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> |
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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 || SVGExternalResourcesRequired::isKnownAttribute(attrName)) { | 168 || SVGExternalResourcesRequired::isKnownAttribute(attrName)) { |
169 RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer); | 169 RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer); |
170 return; | 170 return; |
171 } | 171 } |
172 | 172 |
173 ASSERT_NOT_REACHED(); | 173 ASSERT_NOT_REACHED(); |
174 } | 174 } |
175 | 175 |
176 bool SVGImageElement::selfHasRelativeLengths() const | 176 bool SVGImageElement::selfHasRelativeLengths() const |
177 { | 177 { |
178 return x().isRelative() | 178 return xCurrentValue().isRelative() |
179 || y().isRelative() | 179 || yCurrentValue().isRelative() |
180 || width().isRelative() | 180 || widthCurrentValue().isRelative() |
181 || height().isRelative(); | 181 || heightCurrentValue().isRelative(); |
182 } | 182 } |
183 | 183 |
184 RenderObject* SVGImageElement::createRenderer(RenderStyle*) | 184 RenderObject* SVGImageElement::createRenderer(RenderStyle*) |
185 { | 185 { |
186 return new (document()->renderArena()) RenderSVGImage(this); | 186 return new (document()->renderArena()) RenderSVGImage(this); |
187 } | 187 } |
188 | 188 |
189 bool SVGImageElement::haveLoadedRequiredResources() | 189 bool SVGImageElement::haveLoadedRequiredResources() |
190 { | 190 { |
191 return !externalResourcesRequiredBaseValue() || !m_imageLoader.hasPendingAct
ivity(); | 191 return !externalResourcesRequiredBaseValue() || !m_imageLoader.hasPendingAct
ivity(); |
(...skipping 24 matching lines...) Expand all Loading... |
216 | 216 |
217 const AtomicString& SVGImageElement::imageSourceURL() const | 217 const AtomicString& SVGImageElement::imageSourceURL() const |
218 { | 218 { |
219 return getAttribute(XLinkNames::hrefAttr); | 219 return getAttribute(XLinkNames::hrefAttr); |
220 } | 220 } |
221 | 221 |
222 void SVGImageElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const | 222 void SVGImageElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const |
223 { | 223 { |
224 SVGGraphicsElement::addSubresourceAttributeURLs(urls); | 224 SVGGraphicsElement::addSubresourceAttributeURLs(urls); |
225 | 225 |
226 addSubresourceURL(urls, document()->completeURL(href())); | 226 addSubresourceURL(urls, document()->completeURL(hrefCurrentValue())); |
227 } | 227 } |
228 | 228 |
229 void SVGImageElement::didMoveToNewDocument(Document* oldDocument) | 229 void SVGImageElement::didMoveToNewDocument(Document* oldDocument) |
230 { | 230 { |
231 m_imageLoader.elementDidMoveToNewDocument(); | 231 m_imageLoader.elementDidMoveToNewDocument(); |
232 SVGGraphicsElement::didMoveToNewDocument(oldDocument); | 232 SVGGraphicsElement::didMoveToNewDocument(oldDocument); |
233 } | 233 } |
234 | 234 |
235 } | 235 } |
OLD | NEW |