diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 16:35:48 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:42 +0100 |
| commit | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (patch) | |
| tree | ddce1aa5e3b6967a69691892e500897558ff8ab6 /WebCore/svg/SVGFontFaceUriElement.cpp | |
| parent | 12bec63ec71e46baba27f0bd9bd9d8067683690a (diff) | |
| download | external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.zip external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.gz external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.bz2 | |
Merge WebKit at r67178 : Initial merge by git.
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
Diffstat (limited to 'WebCore/svg/SVGFontFaceUriElement.cpp')
| -rw-r--r-- | WebCore/svg/SVGFontFaceUriElement.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/svg/SVGFontFaceUriElement.cpp b/WebCore/svg/SVGFontFaceUriElement.cpp index 4d03b2b..3ecba16 100644 --- a/WebCore/svg/SVGFontFaceUriElement.cpp +++ b/WebCore/svg/SVGFontFaceUriElement.cpp @@ -26,7 +26,7 @@ #include "Attribute.h" #include "CSSFontFaceSrcValue.h" #include "CachedFont.h" -#include "DocLoader.h" +#include "CachedResourceLoader.h" #include "Document.h" #include "SVGFontFaceElement.h" #include "SVGNames.h" @@ -94,12 +94,12 @@ void SVGFontFaceUriElement::loadFont() String href = getAttribute(XLinkNames::hrefAttr); if (!href.isNull()) { - DocLoader* docLoader = document()->docLoader(); - m_cachedFont = docLoader->requestFont(href); + CachedResourceLoader* cachedResourceLoader = document()->cachedResourceLoader(); + m_cachedFont = cachedResourceLoader->requestFont(href); if (m_cachedFont) { m_cachedFont->setSVGFont(true); m_cachedFont->addClient(this); - m_cachedFont->beginLoadIfNeeded(docLoader); + m_cachedFont->beginLoadIfNeeded(cachedResourceLoader); } } else m_cachedFont = 0; |