diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/chromium/src/WebURLRequest.cpp | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/chromium/src/WebURLRequest.cpp')
-rw-r--r-- | Source/WebKit/chromium/src/WebURLRequest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebKit/chromium/src/WebURLRequest.cpp b/Source/WebKit/chromium/src/WebURLRequest.cpp index 7a77ca3..47139b3 100644 --- a/Source/WebKit/chromium/src/WebURLRequest.cpp +++ b/Source/WebKit/chromium/src/WebURLRequest.cpp @@ -56,7 +56,6 @@ public: { m_resourceRequest = &m_resourceRequestAllocation; m_allowStoredCredentials = p->m_allowStoredCredentials; - m_downloadToFile = p->m_downloadToFile; } virtual void dispose() { delete this; } @@ -269,12 +268,12 @@ void WebURLRequest::setAppCacheHostID(int appCacheHostID) bool WebURLRequest::downloadToFile() const { - return m_private->m_downloadToFile; + return m_private->m_resourceRequest->downloadToFile(); } void WebURLRequest::setDownloadToFile(bool downloadToFile) { - m_private->m_downloadToFile = downloadToFile; + m_private->m_resourceRequest->setDownloadToFile(downloadToFile); } ResourceRequest& WebURLRequest::toMutableResourceRequest() |