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

Side by Side Diff: content/browser/service_worker/service_worker_url_request_job.cc

Issue 2703343002: ServiceWorker: Use mojo's data pipe for respondWith(stream) (Closed)
Patch Set: Addressed comments from kinuko and haraken Created 3 years, 8 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
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_url_request_job.h" 5 #include "content/browser/service_worker/service_worker_url_request_job.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 11 matching lines...) Expand all
22 #include "base/single_thread_task_runner.h" 22 #include "base/single_thread_task_runner.h"
23 #include "base/strings/stringprintf.h" 23 #include "base/strings/stringprintf.h"
24 #include "base/task_runner.h" 24 #include "base/task_runner.h"
25 #include "base/task_runner_util.h" 25 #include "base/task_runner_util.h"
26 #include "base/threading/sequenced_worker_pool.h" 26 #include "base/threading/sequenced_worker_pool.h"
27 #include "base/threading/thread_task_runner_handle.h" 27 #include "base/threading/thread_task_runner_handle.h"
28 #include "base/time/time.h" 28 #include "base/time/time.h"
29 #include "content/browser/resource_context_impl.h" 29 #include "content/browser/resource_context_impl.h"
30 #include "content/browser/service_worker/embedded_worker_instance.h" 30 #include "content/browser/service_worker/embedded_worker_instance.h"
31 #include "content/browser/service_worker/service_worker_blob_reader.h" 31 #include "content/browser/service_worker/service_worker_blob_reader.h"
32 #include "content/browser/service_worker/service_worker_data_pipe_reader.h"
32 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" 33 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
33 #include "content/browser/service_worker/service_worker_provider_host.h" 34 #include "content/browser/service_worker/service_worker_provider_host.h"
34 #include "content/browser/service_worker/service_worker_response_info.h" 35 #include "content/browser/service_worker/service_worker_response_info.h"
35 #include "content/browser/service_worker/service_worker_stream_reader.h"
36 #include "content/common/resource_request_body_impl.h" 36 #include "content/common/resource_request_body_impl.h"
37 #include "content/common/service_worker/service_worker_types.h" 37 #include "content/common/service_worker/service_worker_types.h"
38 #include "content/common/service_worker/service_worker_utils.h" 38 #include "content/common/service_worker/service_worker_utils.h"
39 #include "content/public/browser/blob_handle.h" 39 #include "content/public/browser/blob_handle.h"
40 #include "content/public/browser/browser_thread.h" 40 #include "content/public/browser/browser_thread.h"
41 #include "content/public/browser/resource_request_info.h" 41 #include "content/public/browser/resource_request_info.h"
42 #include "content/public/browser/service_worker_context.h" 42 #include "content/public/browser/service_worker_context.h"
43 #include "content/public/common/referrer.h" 43 #include "content/public/common/referrer.h"
44 #include "net/base/net_errors.h" 44 #include "net/base/net_errors.h"
45 #include "net/http/http_request_headers.h" 45 #include "net/http/http_request_headers.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 frame_type_(frame_type), 254 frame_type_(frame_type),
255 fall_back_required_(false), 255 fall_back_required_(false),
256 body_(body), 256 body_(body),
257 fetch_type_(fetch_type), 257 fetch_type_(fetch_type),
258 timeout_(timeout), 258 timeout_(timeout),
259 weak_factory_(this) { 259 weak_factory_(this) {
260 DCHECK(delegate_) << "ServiceWorkerURLRequestJob requires a delegate"; 260 DCHECK(delegate_) << "ServiceWorkerURLRequestJob requires a delegate";
261 } 261 }
262 262
263 ServiceWorkerURLRequestJob::~ServiceWorkerURLRequestJob() { 263 ServiceWorkerURLRequestJob::~ServiceWorkerURLRequestJob() {
264 stream_reader_.reset(); 264 data_pipe_reader_.reset();
265 file_size_resolver_.reset(); 265 file_size_resolver_.reset();
266 266
267 if (!ShouldRecordResult()) 267 if (!ShouldRecordResult())
268 return; 268 return;
269 ServiceWorkerMetrics::URLRequestJobResult result = 269 ServiceWorkerMetrics::URLRequestJobResult result =
270 ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED; 270 ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED;
271 if (response_body_type_ == STREAM) 271 if (response_body_type_ == STREAM)
272 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_STREAM; 272 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_STREAM;
273 else if (response_body_type_ == BLOB) 273 else if (response_body_type_ == BLOB)
274 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_BLOB; 274 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_BLOB;
(...skipping 30 matching lines...) Expand all
305 MaybeStartRequest(); 305 MaybeStartRequest();
306 } 306 }
307 307
308 void ServiceWorkerURLRequestJob::Start() { 308 void ServiceWorkerURLRequestJob::Start() {
309 is_started_ = true; 309 is_started_ = true;
310 MaybeStartRequest(); 310 MaybeStartRequest();
311 } 311 }
312 312
313 void ServiceWorkerURLRequestJob::Kill() { 313 void ServiceWorkerURLRequestJob::Kill() {
314 net::URLRequestJob::Kill(); 314 net::URLRequestJob::Kill();
315 stream_reader_.reset(); 315 data_pipe_reader_.reset();
316 fetch_dispatcher_.reset(); 316 fetch_dispatcher_.reset();
317 blob_reader_.reset(); 317 blob_reader_.reset();
318 weak_factory_.InvalidateWeakPtrs(); 318 weak_factory_.InvalidateWeakPtrs();
319 } 319 }
320 320
321 net::LoadState ServiceWorkerURLRequestJob::GetLoadState() const { 321 net::LoadState ServiceWorkerURLRequestJob::GetLoadState() const {
322 // TODO(kinuko): refine this for better debug. 322 // TODO(kinuko): refine this for better debug.
323 return net::URLRequestJob::GetLoadState(); 323 return net::URLRequestJob::GetLoadState();
324 } 324 }
325 325
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 360
361 // We don't support multiple range requests in one single URL request. 361 // We don't support multiple range requests in one single URL request.
362 if (ranges.size() == 1U) 362 if (ranges.size() == 1U)
363 byte_range_ = ranges[0]; 363 byte_range_ = ranges[0];
364 } 364 }
365 365
366 int ServiceWorkerURLRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size) { 366 int ServiceWorkerURLRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size) {
367 DCHECK(buf); 367 DCHECK(buf);
368 DCHECK_GE(buf_size, 0); 368 DCHECK_GE(buf_size, 0);
369 369
370 if (stream_reader_) 370 if (data_pipe_reader_)
371 return stream_reader_->ReadRawData(buf, buf_size); 371 return data_pipe_reader_->ReadRawData(buf, buf_size);
372 if (blob_reader_) 372 if (blob_reader_)
373 return blob_reader_->ReadRawData(buf, buf_size); 373 return blob_reader_->ReadRawData(buf, buf_size);
374 374
375 return 0; 375 return 0;
376 } 376 }
377 377
378 void ServiceWorkerURLRequestJob::OnResponseStarted() { 378 void ServiceWorkerURLRequestJob::OnResponseStarted() {
379 if (response_time_.is_null()) 379 if (response_time_.is_null())
380 response_time_ = base::Time::Now(); 380 response_time_ = base::Time::Now();
381 CommitResponseHeader(); 381 CommitResponseHeader();
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 ServiceWorkerMetrics::RecordActivatedWorkerPreparationForMainFrame( 557 ServiceWorkerMetrics::RecordActivatedWorkerPreparationForMainFrame(
558 worker_ready_time_ - request()->creation_time(), initial_worker_status_, 558 worker_ready_time_ - request()->creation_time(), initial_worker_status_,
559 worker_start_situation_, did_navigation_preload_); 559 worker_start_situation_, did_navigation_preload_);
560 MaybeReportNavigationPreloadMetrics(); 560 MaybeReportNavigationPreloadMetrics();
561 } 561 }
562 562
563 void ServiceWorkerURLRequestJob::DidDispatchFetchEvent( 563 void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
564 ServiceWorkerStatusCode status, 564 ServiceWorkerStatusCode status,
565 ServiceWorkerFetchEventResult fetch_result, 565 ServiceWorkerFetchEventResult fetch_result,
566 const ServiceWorkerResponse& response, 566 const ServiceWorkerResponse& response,
567 blink::mojom::ServiceWorkerStreamHandlePtr body_as_stream,
567 const scoped_refptr<ServiceWorkerVersion>& version) { 568 const scoped_refptr<ServiceWorkerVersion>& version) {
568 // Do not clear |fetch_dispatcher_| if it has dispatched a navigation preload 569 // Do not clear |fetch_dispatcher_| if it has dispatched a navigation preload
569 // request to keep the mojom::URLLoader related objects in it, because the 570 // request to keep the mojom::URLLoader related objects in it, because the
570 // preload response might still need to be streamed even after calling 571 // preload response might still need to be streamed even after calling
571 // respondWith(). 572 // respondWith().
572 if (!did_navigation_preload_) { 573 if (!did_navigation_preload_) {
573 fetch_dispatcher_.reset(); 574 fetch_dispatcher_.reset();
574 } 575 }
575 ServiceWorkerMetrics::RecordFetchEventStatus(IsMainResourceLoad(), status); 576 ServiceWorkerMetrics::RecordFetchEventStatus(IsMainResourceLoad(), status);
576 577
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 // HttpResponseInfo to show HTTPS padlock. 623 // HttpResponseInfo to show HTTPS padlock.
623 // TODO(horo): When we support mixed-content (HTTP) no-cors requests from a 624 // TODO(horo): When we support mixed-content (HTTP) no-cors requests from a
624 // ServiceWorker, we have to check the security level of the responses. 625 // ServiceWorker, we have to check the security level of the responses.
625 DCHECK(!http_response_info_); 626 DCHECK(!http_response_info_);
626 DCHECK(version); 627 DCHECK(version);
627 const net::HttpResponseInfo* main_script_http_info = 628 const net::HttpResponseInfo* main_script_http_info =
628 version->GetMainScriptHttpResponseInfo(); 629 version->GetMainScriptHttpResponseInfo();
629 DCHECK(main_script_http_info); 630 DCHECK(main_script_http_info);
630 http_response_info_.reset(new net::HttpResponseInfo(*main_script_http_info)); 631 http_response_info_.reset(new net::HttpResponseInfo(*main_script_http_info));
631 632
632 // Set up a request for reading the stream. 633 // Process stream using Mojo's data pipe.
633 if (response.stream_url.is_valid()) { 634 if (!body_as_stream.is_null()) {
634 DCHECK(response.blob_uuid.empty());
635 SetResponseBodyType(STREAM); 635 SetResponseBodyType(STREAM);
636 SetResponse(response); 636 SetResponse(response);
637 stream_reader_.reset(new ServiceWorkerStreamReader(this, version)); 637 data_pipe_reader_.reset(new ServiceWorkerDataPipeReader(
638 stream_reader_->Start(response.stream_url); 638 this, version, std::move(body_as_stream)));
639 data_pipe_reader_->Start();
639 return; 640 return;
640 } 641 }
641 642
642 // Set up a request for reading the blob. 643 // Set up a request for reading the blob.
643 if (!response.blob_uuid.empty() && blob_storage_context_) { 644 if (!response.blob_uuid.empty() && blob_storage_context_) {
644 SetResponseBodyType(BLOB); 645 SetResponseBodyType(BLOB);
645 std::unique_ptr<storage::BlobDataHandle> blob_data_handle = 646 std::unique_ptr<storage::BlobDataHandle> blob_data_handle =
646 blob_storage_context_->GetBlobDataFromUUID(response.blob_uuid); 647 blob_storage_context_->GetBlobDataFromUUID(response.blob_uuid);
647 if (!blob_data_handle) { 648 if (!blob_data_handle) {
648 // The renderer gave us a bad blob UUID. 649 // The renderer gave us a bad blob UUID.
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 DCHECK(!reported_navigation_preload_metrics_); 910 DCHECK(!reported_navigation_preload_metrics_);
910 reported_navigation_preload_metrics_ = true; 911 reported_navigation_preload_metrics_ = true;
911 912
912 ServiceWorkerMetrics::RecordNavigationPreloadResponse( 913 ServiceWorkerMetrics::RecordNavigationPreloadResponse(
913 worker_ready_time_ - worker_start_time_, 914 worker_ready_time_ - worker_start_time_,
914 navigation_preload_response_time_ - worker_start_time_, 915 navigation_preload_response_time_ - worker_start_time_,
915 initial_worker_status_, worker_start_situation_); 916 initial_worker_status_, worker_start_situation_);
916 } 917 }
917 918
918 } // namespace content 919 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698