| 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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 imageObj->imageResource()->setImageResource(imageLoader().image()); | 187 imageObj->imageResource()->setImageResource(imageLoader().image()); |
| 188 } | 188 } |
| 189 } | 189 } |
| 190 | 190 |
| 191 Node::InsertionNotificationRequest SVGImageElement::insertedInto( | 191 Node::InsertionNotificationRequest SVGImageElement::insertedInto( |
| 192 ContainerNode* rootParent) { | 192 ContainerNode* rootParent) { |
| 193 SVGGraphicsElement::insertedInto(rootParent); | 193 SVGGraphicsElement::insertedInto(rootParent); |
| 194 if (!rootParent->isConnected()) | 194 if (!rootParent->isConnected()) |
| 195 return InsertionDone; | 195 return InsertionDone; |
| 196 | 196 |
| 197 // We can only resolve base URIs properly after tree insertion - hence, URI mu
tations while | 197 // We can only resolve base URIs properly after tree insertion - hence, URI |
| 198 // detached are deferred until this point. | 198 // mutations while detached are deferred until this point. |
| 199 if (m_needsLoaderURIUpdate) { | 199 if (m_needsLoaderURIUpdate) { |
| 200 imageLoader().updateFromElement(ImageLoader::UpdateIgnorePreviousError); | 200 imageLoader().updateFromElement(ImageLoader::UpdateIgnorePreviousError); |
| 201 m_needsLoaderURIUpdate = false; | 201 m_needsLoaderURIUpdate = false; |
| 202 } else { | 202 } else { |
| 203 // A previous loader update may have failed to actually fetch the image if t
he document | 203 // A previous loader update may have failed to actually fetch the image if |
| 204 // was inactive. In that case, force a re-update (but don't clear previous e
rrors). | 204 // the document was inactive. In that case, force a re-update (but don't |
| 205 // clear previous errors). |
| 205 if (!imageLoader().image()) | 206 if (!imageLoader().image()) |
| 206 imageLoader().updateFromElement(); | 207 imageLoader().updateFromElement(); |
| 207 } | 208 } |
| 208 | 209 |
| 209 return InsertionDone; | 210 return InsertionDone; |
| 210 } | 211 } |
| 211 | 212 |
| 212 const AtomicString SVGImageElement::imageSourceURL() const { | 213 const AtomicString SVGImageElement::imageSourceURL() const { |
| 213 return AtomicString(hrefString()); | 214 return AtomicString(hrefString()); |
| 214 } | 215 } |
| 215 | 216 |
| 216 void SVGImageElement::didMoveToNewDocument(Document& oldDocument) { | 217 void SVGImageElement::didMoveToNewDocument(Document& oldDocument) { |
| 217 imageLoader().elementDidMoveToNewDocument(); | 218 imageLoader().elementDidMoveToNewDocument(); |
| 218 SVGGraphicsElement::didMoveToNewDocument(oldDocument); | 219 SVGGraphicsElement::didMoveToNewDocument(oldDocument); |
| 219 } | 220 } |
| 220 | 221 |
| 221 } // namespace blink | 222 } // namespace blink |
| OLD | NEW |