OLD | NEW |
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_url_request_job.h" | 5 #include "content/browser/service_worker/service_worker_url_request_job.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
13 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" | 13 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" |
14 #include "content/browser/service_worker/service_worker_provider_host.h" | 14 #include "content/browser/service_worker/service_worker_provider_host.h" |
15 #include "net/http/http_request_headers.h" | 15 #include "net/http/http_request_headers.h" |
16 #include "net/http/http_response_headers.h" | 16 #include "net/http/http_response_headers.h" |
17 #include "net/http/http_response_info.h" | 17 #include "net/http/http_response_info.h" |
18 #include "net/http/http_util.h" | 18 #include "net/http/http_util.h" |
19 #include "webkit/browser/blob/blob_data_handle.h" | 19 #include "storage/browser/blob/blob_data_handle.h" |
20 #include "webkit/browser/blob/blob_storage_context.h" | 20 #include "storage/browser/blob/blob_storage_context.h" |
21 #include "webkit/browser/blob/blob_url_request_job_factory.h" | 21 #include "storage/browser/blob/blob_url_request_job_factory.h" |
22 | 22 |
23 namespace content { | 23 namespace content { |
24 | 24 |
25 ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob( | 25 ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob( |
26 net::URLRequest* request, | 26 net::URLRequest* request, |
27 net::NetworkDelegate* network_delegate, | 27 net::NetworkDelegate* network_delegate, |
28 base::WeakPtr<ServiceWorkerProviderHost> provider_host, | 28 base::WeakPtr<ServiceWorkerProviderHost> provider_host, |
29 base::WeakPtr<webkit_blob::BlobStorageContext> blob_storage_context) | 29 base::WeakPtr<storage::BlobStorageContext> blob_storage_context) |
30 : net::URLRequestJob(request, network_delegate), | 30 : net::URLRequestJob(request, network_delegate), |
31 provider_host_(provider_host), | 31 provider_host_(provider_host), |
32 response_type_(NOT_DETERMINED), | 32 response_type_(NOT_DETERMINED), |
33 is_started_(false), | 33 is_started_(false), |
34 blob_storage_context_(blob_storage_context), | 34 blob_storage_context_(blob_storage_context), |
35 weak_factory_(this) { | 35 weak_factory_(this) { |
36 } | 36 } |
37 | 37 |
38 void ServiceWorkerURLRequestJob::FallbackToNetwork() { | 38 void ServiceWorkerURLRequestJob::FallbackToNetwork() { |
39 DCHECK_EQ(NOT_DETERMINED, response_type_); | 39 DCHECK_EQ(NOT_DETERMINED, response_type_); |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 response_type_ = FALLBACK_TO_NETWORK; | 256 response_type_ = FALLBACK_TO_NETWORK; |
257 NotifyRestartRequired(); | 257 NotifyRestartRequired(); |
258 return; | 258 return; |
259 } | 259 } |
260 | 260 |
261 // We should have a response now. | 261 // We should have a response now. |
262 DCHECK_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, fetch_result); | 262 DCHECK_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, fetch_result); |
263 | 263 |
264 // Set up a request for reading the blob. | 264 // Set up a request for reading the blob. |
265 if (!response.blob_uuid.empty() && blob_storage_context_) { | 265 if (!response.blob_uuid.empty() && blob_storage_context_) { |
266 scoped_ptr<webkit_blob::BlobDataHandle> blob_data_handle = | 266 scoped_ptr<storage::BlobDataHandle> blob_data_handle = |
267 blob_storage_context_->GetBlobDataFromUUID(response.blob_uuid); | 267 blob_storage_context_->GetBlobDataFromUUID(response.blob_uuid); |
268 if (!blob_data_handle) { | 268 if (!blob_data_handle) { |
269 // The renderer gave us a bad blob UUID. | 269 // The renderer gave us a bad blob UUID. |
270 DeliverErrorResponse(); | 270 DeliverErrorResponse(); |
271 return; | 271 return; |
272 } | 272 } |
273 blob_request_ = webkit_blob::BlobProtocolHandler::CreateBlobRequest( | 273 blob_request_ = storage::BlobProtocolHandler::CreateBlobRequest( |
274 blob_data_handle.Pass(), request()->context(), this); | 274 blob_data_handle.Pass(), request()->context(), this); |
275 blob_request_->Start(); | 275 blob_request_->Start(); |
276 } | 276 } |
277 | 277 |
278 response_url_ = response.url; | 278 response_url_ = response.url; |
279 CreateResponseHeader( | 279 CreateResponseHeader( |
280 response.status_code, response.status_text, response.headers); | 280 response.status_code, response.status_text, response.headers); |
281 if (!blob_request_) | 281 if (!blob_request_) |
282 CommitResponseHeader(); | 282 CommitResponseHeader(); |
283 } | 283 } |
(...skipping 29 matching lines...) Expand all Loading... |
313 void ServiceWorkerURLRequestJob::DeliverErrorResponse() { | 313 void ServiceWorkerURLRequestJob::DeliverErrorResponse() { |
314 // TODO(falken): Print an error to the console of the ServiceWorker and of | 314 // TODO(falken): Print an error to the console of the ServiceWorker and of |
315 // the requesting page. | 315 // the requesting page. |
316 CreateResponseHeader(500, | 316 CreateResponseHeader(500, |
317 "Service Worker Response Error", | 317 "Service Worker Response Error", |
318 std::map<std::string, std::string>()); | 318 std::map<std::string, std::string>()); |
319 CommitResponseHeader(); | 319 CommitResponseHeader(); |
320 } | 320 } |
321 | 321 |
322 } // namespace content | 322 } // namespace content |
OLD | NEW |