diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 05:19:13 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 05:19:13 +0000 |
| commit | 61b4a61bf1ea2a610c076cb28de59aa1137b3c4f (patch) | |
| tree | 4a2b6465bcea096b8410c1e0a5dbb279fa34c1ba /webkit/glue/weburlloader_impl.cc | |
| parent | 4e5ae20ff403cdcd14d3b86b18a0d0bcec2f47cc (diff) | |
| download | chromium_src-61b4a61bf1ea2a610c076cb28de59aa1137b3c4f.zip chromium_src-61b4a61bf1ea2a610c076cb28de59aa1137b3c4f.tar.gz chromium_src-61b4a61bf1ea2a610c076cb28de59aa1137b3c4f.tar.bz2 | |
Revert 60378 (trying to track down http://crbug.com/56752 )- Flesh out URLLoader's download_to_file function.
* tie the lifetime of the resulting temp file to the lifetime of the URLLoader
(the plan is to later extend the lifetime of the temp file to support xhr.responseBlob)
* make it work in test_shell
* make it work for sync requests
* added OnDataDownloaded messages to report progress
A related BlobURL loading change.
* grab a reference to the blob early on to ensure it's still there when the 'job' is finally started.
TEST=manual and deletable_file_reference_unittest.cc
BUG=52486
Review URL: http://codereview.chromium.org/3165062
TBR=michaeln@chromium.org
Review URL: http://codereview.chromium.org/3455022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/weburlloader_impl.cc')
| -rw-r--r-- | webkit/glue/weburlloader_impl.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc index aa63fc2..528626e 100644 --- a/webkit/glue/weburlloader_impl.cc +++ b/webkit/glue/weburlloader_impl.cc @@ -284,7 +284,6 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context>, scoped_ptr<ResourceLoaderBridge> bridge_; scoped_ptr<FtpDirectoryListingResponseDelegate> ftp_listing_delegate_; scoped_ptr<MultipartResponseDelegate> multipart_delegate_; - scoped_ptr<ResourceLoaderBridge> completed_bridge_; // TODO(japhet): Storing this is a temporary hack for site isolation logging. WebURL response_url_; @@ -599,10 +598,8 @@ void WebURLLoaderImpl::Context::OnCompletedRequest( multipart_delegate_.reset(NULL); } - // Prevent any further IPC to the browser now that we're complete, but - // don't delete it to keep any downloaded temp files alive. - DCHECK(!completed_bridge_.get()); - completed_bridge_.swap(bridge_); + // Prevent any further IPC to the browser now that we're complete. + bridge_.reset(); if (client_) { if (status.status() != URLRequestStatus::SUCCESS) { |