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/Request.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/Request.cpp')
-rw-r--r-- | WebCore/loader/Request.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/loader/Request.cpp b/WebCore/loader/Request.cpp index 630a4bb..6ad6f9c 100644 --- a/WebCore/loader/Request.cpp +++ b/WebCore/loader/Request.cpp @@ -28,9 +28,9 @@ namespace WebCore { -Request::Request(DocLoader* docLoader, CachedResource* object, bool incremental, SecurityCheckPolicy shouldDoSecurityCheck, bool sendResourceLoadCallbacks) +Request::Request(CachedResourceLoader* cachedResourceLoader, CachedResource* object, bool incremental, SecurityCheckPolicy shouldDoSecurityCheck, bool sendResourceLoadCallbacks) : m_object(object) - , m_docLoader(docLoader) + , m_cachedResourceLoader(cachedResourceLoader) , m_incremental(incremental) , m_multipart(false) , m_shouldDoSecurityCheck(shouldDoSecurityCheck) |