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

Side by Side Diff: content/browser/service_worker/service_worker_controllee_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: fix merge conflict Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/service_worker/service_worker_controllee_request_handl er.h" 5 #include "content/browser/service_worker/service_worker_controllee_request_handl er.h"
6 6
7 #include "content/browser/service_worker/service_worker_context_core.h" 7 #include "content/browser/service_worker/service_worker_context_core.h"
8 #include "content/browser/service_worker/service_worker_provider_host.h" 8 #include "content/browser/service_worker/service_worker_provider_host.h"
9 #include "content/browser/service_worker/service_worker_registration.h" 9 #include "content/browser/service_worker/service_worker_registration.h"
10 #include "content/browser/service_worker/service_worker_url_request_job.h" 10 #include "content/browser/service_worker/service_worker_url_request_job.h"
11 #include "content/browser/service_worker/service_worker_utils.h" 11 #include "content/browser/service_worker/service_worker_utils.h"
12 #include "content/common/service_worker/service_worker_types.h" 12 #include "content/common/service_worker/service_worker_types.h"
13 #include "net/url_request/url_request.h" 13 #include "net/url_request/url_request.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 ServiceWorkerControlleeRequestHandler::ServiceWorkerControlleeRequestHandler( 17 ServiceWorkerControlleeRequestHandler::ServiceWorkerControlleeRequestHandler(
18 base::WeakPtr<ServiceWorkerContextCore> context, 18 base::WeakPtr<ServiceWorkerContextCore> context,
19 base::WeakPtr<ServiceWorkerProviderHost> provider_host, 19 base::WeakPtr<ServiceWorkerProviderHost> provider_host,
20 base::WeakPtr<webkit_blob::BlobStorageContext> blob_storage_context,
20 ResourceType::Type resource_type) 21 ResourceType::Type resource_type)
21 : ServiceWorkerRequestHandler(context, provider_host, resource_type), 22 : ServiceWorkerRequestHandler(context,
23 provider_host,
24 blob_storage_context,
25 resource_type),
22 weak_factory_(this) { 26 weak_factory_(this) {
23 } 27 }
24 28
25 ServiceWorkerControlleeRequestHandler:: 29 ServiceWorkerControlleeRequestHandler::
26 ~ServiceWorkerControlleeRequestHandler() { 30 ~ServiceWorkerControlleeRequestHandler() {
27 } 31 }
28 32
29 net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob( 33 net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob(
30 net::URLRequest* request, 34 net::URLRequest* request,
31 net::NetworkDelegate* network_delegate) { 35 net::NetworkDelegate* network_delegate) {
(...skipping 13 matching lines...) Expand all
45 // We've come here by restart, we already have original request and it 49 // We've come here by restart, we already have original request and it
46 // tells we should fallback to network. (Case B-c) 50 // tells we should fallback to network. (Case B-c)
47 if (job_.get() && job_->ShouldFallbackToNetwork()) { 51 if (job_.get() && job_->ShouldFallbackToNetwork()) {
48 job_ = NULL; 52 job_ = NULL;
49 return NULL; 53 return NULL;
50 } 54 }
51 55
52 // It's for original request (A) or redirect case (B-a or B-b). 56 // It's for original request (A) or redirect case (B-a or B-b).
53 DCHECK(!job_.get() || job_->ShouldForwardToServiceWorker()); 57 DCHECK(!job_.get() || job_->ShouldForwardToServiceWorker());
54 58
55 job_ = new ServiceWorkerURLRequestJob(request, network_delegate, 59 job_ = new ServiceWorkerURLRequestJob(
56 provider_host_); 60 request, network_delegate, provider_host_, blob_storage_context_);
57 if (ServiceWorkerUtils::IsMainResourceType(resource_type_)) 61 if (ServiceWorkerUtils::IsMainResourceType(resource_type_))
58 PrepareForMainResource(request->url()); 62 PrepareForMainResource(request->url());
59 else 63 else
60 PrepareForSubResource(); 64 PrepareForSubResource();
61 65
62 if (job_->ShouldFallbackToNetwork()) { 66 if (job_->ShouldFallbackToNetwork()) {
63 // If we know we can fallback to network at this point (in case 67 // If we know we can fallback to network at this point (in case
64 // the storage lookup returned immediately), just return NULL here to 68 // the storage lookup returned immediately), just return NULL here to
65 // fallback to network. 69 // fallback to network.
66 job_ = NULL; 70 job_ = NULL;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 } 109 }
106 110
107 void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() { 111 void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() {
108 DCHECK(job_.get()); 112 DCHECK(job_.get());
109 DCHECK(context_); 113 DCHECK(context_);
110 DCHECK(provider_host_->active_version()); 114 DCHECK(provider_host_->active_version());
111 job_->ForwardToServiceWorker(); 115 job_->ForwardToServiceWorker();
112 } 116 }
113 117
114 } // namespace content 118 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698