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/css/CSSImportRule.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/css/CSSImportRule.cpp')
| -rw-r--r-- | WebCore/css/CSSImportRule.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/css/CSSImportRule.cpp b/WebCore/css/CSSImportRule.cpp index cc6083e..192f44e 100644 --- a/WebCore/css/CSSImportRule.cpp +++ b/WebCore/css/CSSImportRule.cpp @@ -23,7 +23,7 @@ #include "CSSImportRule.h" #include "CachedCSSStyleSheet.h" -#include "DocLoader.h" +#include "CachedResourceLoader.h" #include "Document.h" #include "SecurityOrigin.h" #include "Settings.h" @@ -115,8 +115,8 @@ void CSSImportRule::insertedIntoParent() if (!parentSheet) return; - DocLoader* docLoader = parentSheet->document()->docLoader(); - if (!docLoader) + CachedResourceLoader* cachedResourceLoader = parentSheet->document()->cachedResourceLoader(); + if (!cachedResourceLoader) return; String absHref = m_strHref; @@ -135,9 +135,9 @@ void CSSImportRule::insertedIntoParent() } if (parentSheet->isUserStyleSheet()) - m_cachedSheet = docLoader->requestUserCSSStyleSheet(absHref, parentSheet->charset()); + m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(absHref, parentSheet->charset()); else - m_cachedSheet = docLoader->requestCSSStyleSheet(absHref, parentSheet->charset()); + m_cachedSheet = cachedResourceLoader->requestCSSStyleSheet(absHref, parentSheet->charset()); if (m_cachedSheet) { // if the import rule is issued dynamically, the sheet may be // removed from the pending sheet count, so let the doc know |