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/xml/XSLImportRule.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/xml/XSLImportRule.cpp')
| -rw-r--r-- | WebCore/xml/XSLImportRule.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/xml/XSLImportRule.cpp b/WebCore/xml/XSLImportRule.cpp index 0908d75..c32da4e 100644 --- a/WebCore/xml/XSLImportRule.cpp +++ b/WebCore/xml/XSLImportRule.cpp @@ -25,7 +25,7 @@ #if ENABLE(XSLT) #include "CachedXSLStyleSheet.h" -#include "DocLoader.h" +#include "CachedResourceLoader.h" #include "XSLStyleSheet.h" namespace WebCore { @@ -77,13 +77,13 @@ bool XSLImportRule::isLoading() void XSLImportRule::loadSheet() { - DocLoader* docLoader = 0; + CachedResourceLoader* cachedResourceLoader = 0; StyleBase* root = this; StyleBase* parent; while ((parent = root->parent())) root = parent; if (root->isXSLStyleSheet()) - docLoader = static_cast<XSLStyleSheet*>(root)->docLoader(); + cachedResourceLoader = static_cast<XSLStyleSheet*>(root)->cachedResourceLoader(); String absHref = m_strHref; XSLStyleSheet* parentSheet = parentStyleSheet(); @@ -98,7 +98,7 @@ void XSLImportRule::loadSheet() return; } - m_cachedSheet = docLoader->requestXSLStyleSheet(absHref); + m_cachedSheet = cachedResourceLoader->requestXSLStyleSheet(absHref); if (m_cachedSheet) { m_cachedSheet->addClient(this); |