| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> | 2 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> |
| 3 * Copyright (C) 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 } | 86 } |
| 87 | 87 |
| 88 void SVGFontFaceUriElement::loadFont() | 88 void SVGFontFaceUriElement::loadFont() |
| 89 { | 89 { |
| 90 if (m_resource) | 90 if (m_resource) |
| 91 m_resource->removeClient(this); | 91 m_resource->removeClient(this); |
| 92 | 92 |
| 93 const AtomicString& href = getAttribute(XLinkNames::hrefAttr); | 93 const AtomicString& href = getAttribute(XLinkNames::hrefAttr); |
| 94 if (!href.isNull()) { | 94 if (!href.isNull()) { |
| 95 ResourceFetcher* fetcher = document().fetcher(); | 95 ResourceFetcher* fetcher = document().fetcher(); |
| 96 FetchRequest request(ResourceRequest(document().completeURL(href)), loca
lName()); | 96 FetchRequest request(ResourceRequest(treeScope().completeURL(href)), loc
alName()); |
| 97 m_resource = fetcher->fetchFont(request); | 97 m_resource = fetcher->fetchFont(request); |
| 98 if (m_resource) { | 98 if (m_resource) { |
| 99 m_resource->addClient(this); | 99 m_resource->addClient(this); |
| 100 m_resource->beginLoadIfNeeded(fetcher); | 100 m_resource->beginLoadIfNeeded(fetcher); |
| 101 } | 101 } |
| 102 } else { | 102 } else { |
| 103 m_resource = 0; | 103 m_resource = 0; |
| 104 } | 104 } |
| 105 } | 105 } |
| 106 | 106 |
| 107 } | 107 } |
| 108 | 108 |
| 109 #endif // ENABLE(SVG_FONTS) | 109 #endif // ENABLE(SVG_FONTS) |
| OLD | NEW |