Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1513)

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 293083002: Add a blob field to ServiceWorkerFetchResponse and read the blob (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix merge conflict Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index e52549cfaa84fd0f51a812cbba988b91bcd6e2a2..86d5e5fb1fff831c54dc35f149a56a55cb0979df 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -310,6 +310,13 @@ bool IsValidatedSCT(
return sct_status.status == net::ct::SCT_STATUS_OK;
}
+webkit_blob::BlobStorageContext* GetBlobStorageContext(
+ ResourceMessageFilter* filter) {
+ if (!filter->blob_storage_context())
+ return NULL;
+ return filter->blob_storage_context()->context();
+}
+
} // namespace
// static
@@ -1050,12 +1057,9 @@ void ResourceDispatcherHostImpl::BeginRequest(
// Resolve elements from request_body and prepare upload data.
if (request_data.request_body.get()) {
- webkit_blob::BlobStorageContext* blob_context = NULL;
- if (filter_->blob_storage_context())
- blob_context = filter_->blob_storage_context()->context();
new_request->set_upload(UploadDataStreamBuilder::Build(
request_data.request_body.get(),
- blob_context,
+ GetBlobStorageContext(filter_),
filter_->file_system_context(),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)
.get()));
@@ -1104,6 +1108,7 @@ void ResourceDispatcherHostImpl::BeginRequest(
ServiceWorkerRequestHandler::InitializeHandler(
new_request.get(),
filter_->service_worker_context(),
+ GetBlobStorageContext(filter_),
child_id,
request_data.service_worker_provider_id,
request_data.resource_type);
« no previous file with comments | « content/browser/fileapi/mock_url_request_delegate.cc ('k') | content/browser/service_worker/embedded_worker_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698