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

Unified Diff: content/browser/service_worker/service_worker_request_handler.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: dont crash in loader 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/service_worker/service_worker_request_handler.cc
diff --git a/content/browser/service_worker/service_worker_request_handler.cc b/content/browser/service_worker/service_worker_request_handler.cc
index ed26f8ead2b0a3cfa2ff8892cae7c399d376c42d..1a70ebd5386173cd35f25fd88c37385f75cb3f10 100644
--- a/content/browser/service_worker/service_worker_request_handler.cc
+++ b/content/browser/service_worker/service_worker_request_handler.cc
@@ -4,6 +4,7 @@
#include "content/browser/service_worker/service_worker_request_handler.h"
+#include "content/browser/fileapi/chrome_blob_storage_context.h"
#include "content/browser/service_worker/service_worker_context_core.h"
#include "content/browser/service_worker/service_worker_context_wrapper.h"
#include "content/browser/service_worker/service_worker_provider_host.h"
@@ -12,6 +13,7 @@
#include "content/browser/service_worker/service_worker_utils.h"
#include "content/common/service_worker/service_worker_types.h"
#include "net/url_request/url_request.h"
+#include "webkit/browser/blob/blob_storage_context.h"
namespace content {
@@ -52,6 +54,7 @@ bool IsSchemeAndMethodSupported(const net::URLRequest* request) {
void ServiceWorkerRequestHandler::InitializeHandler(
net::URLRequest* request,
ServiceWorkerContextWrapper* context_wrapper,
+ webkit_blob::BlobStorageContext* blob_storage_context,
int process_id,
int provider_id,
ResourceType::Type resource_type) {
@@ -71,7 +74,8 @@ void ServiceWorkerRequestHandler::InitializeHandler(
return;
scoped_ptr<ServiceWorkerRequestHandler> handler(
- provider_host->CreateRequestHandler(resource_type));
+ provider_host->CreateRequestHandler(resource_type,
+ blob_storage_context->AsWeakPtr()));
if (!handler)
return;
@@ -96,9 +100,11 @@ ServiceWorkerRequestHandler::~ServiceWorkerRequestHandler() {
ServiceWorkerRequestHandler::ServiceWorkerRequestHandler(
base::WeakPtr<ServiceWorkerContextCore> context,
base::WeakPtr<ServiceWorkerProviderHost> provider_host,
+ base::WeakPtr<webkit_blob::BlobStorageContext> blob_storage_context,
ResourceType::Type resource_type)
: context_(context),
provider_host_(provider_host),
+ blob_storage_context_(blob_storage_context),
resource_type_(resource_type) {
}

Powered by Google App Engine
This is Rietveld 408576698