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 /chrome/browser/net | |
| 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 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/blob_url_request_job_factory.cc | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/chrome/browser/net/blob_url_request_job_factory.cc b/chrome/browser/net/blob_url_request_job_factory.cc index 7297795..dab29d5 100644 --- a/chrome/browser/net/blob_url_request_job_factory.cc +++ b/chrome/browser/net/blob_url_request_job_factory.cc @@ -7,8 +7,6 @@ #include "chrome/browser/chrome_blob_storage_context.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/net/chrome_url_request_context.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "chrome/common/url_constants.h" #include "webkit/blob/blob_storage_controller.h" #include "webkit/blob/blob_url_request_job.h" @@ -17,20 +15,12 @@ namespace { URLRequestJob* BlobURLRequestJobFactory(URLRequest* request, const std::string& scheme) { - scoped_refptr<webkit_blob::BlobData> data; - ResourceDispatcherHostRequestInfo* info = - ResourceDispatcherHost::InfoForRequest(request); - if (info) { - // Resource dispatcher host already looked up the blob data. - data = info->requested_blob_data(); - } else { - // This request is not coming thru resource dispatcher host. - data = static_cast<ChromeURLRequestContext*>(request->context())-> - blob_storage_context()-> - controller()->GetBlobDataFromUrl(request->url()); - } + webkit_blob::BlobStorageController* blob_storage_controller = + static_cast<ChromeURLRequestContext*>(request->context())-> + blob_storage_context()->controller(); return new webkit_blob::BlobURLRequestJob( - request, data, + request, + blob_storage_controller->GetBlobDataFromUrl(request->url()), ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)); } |