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/loader/CachedResource.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/loader/CachedResource.cpp')
| -rw-r--r-- | WebCore/loader/CachedResource.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/loader/CachedResource.cpp b/WebCore/loader/CachedResource.cpp index 887b0b5..a6ff0ff 100644 --- a/WebCore/loader/CachedResource.cpp +++ b/WebCore/loader/CachedResource.cpp @@ -29,7 +29,7 @@ #include "CachedResourceClient.h" #include "CachedResourceClientWalker.h" #include "CachedResourceHandle.h" -#include "DocLoader.h" +#include "CachedResourceLoader.h" #include "Frame.h" #include "FrameLoaderClient.h" #include "KURL.h" @@ -78,7 +78,7 @@ CachedResource::CachedResource(const String& url, Type type) , m_prevInAllResourcesList(0) , m_nextInLiveResourcesList(0) , m_prevInLiveResourcesList(0) - , m_docLoader(0) + , m_cachedResourceLoader(0) , m_resourceToRevalidate(0) , m_proxyResource(0) { @@ -99,14 +99,14 @@ CachedResource::~CachedResource() cachedResourceLeakCounter.decrement(); #endif - if (m_docLoader) - m_docLoader->removeCachedResource(this); + if (m_cachedResourceLoader) + m_cachedResourceLoader->removeCachedResource(this); } -void CachedResource::load(DocLoader* docLoader, bool incremental, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks) +void CachedResource::load(CachedResourceLoader* cachedResourceLoader, bool incremental, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks) { m_sendResourceLoadCallbacks = sendResourceLoadCallbacks; - cache()->loader()->load(docLoader, this, incremental, securityCheck, sendResourceLoadCallbacks); + cache()->loader()->load(cachedResourceLoader, this, incremental, securityCheck, sendResourceLoadCallbacks); m_loading = true; } |