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

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: Used TEST_P to test closing the connection first and On{Aborted,Completed} first 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 frame_type_(frame_type), 253 frame_type_(frame_type),
254 fall_back_required_(false), 254 fall_back_required_(false),
255 body_(body), 255 body_(body),
256 fetch_type_(fetch_type), 256 fetch_type_(fetch_type),
257 timeout_(timeout), 257 timeout_(timeout),
258 weak_factory_(this) { 258 weak_factory_(this) {
259 DCHECK(delegate_) << "ServiceWorkerURLRequestJob requires a delegate"; 259 DCHECK(delegate_) << "ServiceWorkerURLRequestJob requires a delegate";
260 } 260 }
261 261
262 ServiceWorkerURLRequestJob::~ServiceWorkerURLRequestJob() { 262 ServiceWorkerURLRequestJob::~ServiceWorkerURLRequestJob() {
263 stream_reader_.reset(); 263 data_pipe_reader_.reset();
264 file_size_resolver_.reset(); 264 file_size_resolver_.reset();
265 265
266 if (!ShouldRecordResult()) 266 if (!ShouldRecordResult())
267 return; 267 return;
268 ServiceWorkerMetrics::URLRequestJobResult result = 268 ServiceWorkerMetrics::URLRequestJobResult result =
269 ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED; 269 ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED;
270 if (response_body_type_ == STREAM) 270 if (response_body_type_ == STREAM)
271 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_STREAM; 271 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_STREAM;
272 else if (response_body_type_ == BLOB) 272 else if (response_body_type_ == BLOB)
273 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_BLOB; 273 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_BLOB;
(...skipping 30 matching lines...) Expand all
304 MaybeStartRequest(); 304 MaybeStartRequest();
305 } 305 }
306 306
307 void ServiceWorkerURLRequestJob::Start() { 307 void ServiceWorkerURLRequestJob::Start() {
308 is_started_ = true; 308 is_started_ = true;
309 MaybeStartRequest(); 309 MaybeStartRequest();
310 } 310 }
311 311
312 void ServiceWorkerURLRequestJob::Kill() { 312 void ServiceWorkerURLRequestJob::Kill() {
313 net::URLRequestJob::Kill(); 313 net::URLRequestJob::Kill();
314 stream_reader_.reset(); 314 data_pipe_reader_.reset();
315 fetch_dispatcher_.reset(); 315 fetch_dispatcher_.reset();
316 blob_reader_.reset(); 316 blob_reader_.reset();
317 weak_factory_.InvalidateWeakPtrs(); 317 weak_factory_.InvalidateWeakPtrs();
318 } 318 }
319 319
320 net::LoadState ServiceWorkerURLRequestJob::GetLoadState() const { 320 net::LoadState ServiceWorkerURLRequestJob::GetLoadState() const {
321 // TODO(kinuko): refine this for better debug. 321 // TODO(kinuko): refine this for better debug.
322 return net::URLRequestJob::GetLoadState(); 322 return net::URLRequestJob::GetLoadState();
323 } 323 }
324 324
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 359
360 // We don't support multiple range requests in one single URL request. 360 // We don't support multiple range requests in one single URL request.
361 if (ranges.size() == 1U) 361 if (ranges.size() == 1U)
362 byte_range_ = ranges[0]; 362 byte_range_ = ranges[0];
363 } 363 }
364 364
365 int ServiceWorkerURLRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size) { 365 int ServiceWorkerURLRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size) {
366 DCHECK(buf); 366 DCHECK(buf);
367 DCHECK_GE(buf_size, 0); 367 DCHECK_GE(buf_size, 0);
368 368
369 if (stream_reader_) 369 if (data_pipe_reader_)
370 return stream_reader_->ReadRawData(buf, buf_size); 370 return data_pipe_reader_->ReadRawData(buf, buf_size);
371 if (blob_reader_) 371 if (blob_reader_)
372 return blob_reader_->ReadRawData(buf, buf_size); 372 return blob_reader_->ReadRawData(buf, buf_size);
373 373
374 return 0; 374 return 0;
375 } 375 }
376 376
377 void ServiceWorkerURLRequestJob::OnResponseStarted() { 377 void ServiceWorkerURLRequestJob::OnResponseStarted() {
378 if (response_time_.is_null()) 378 if (response_time_.is_null())
379 response_time_ = base::Time::Now(); 379 response_time_ = base::Time::Now();
380 CommitResponseHeader(); 380 CommitResponseHeader();
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 ServiceWorkerMetrics::RecordActivatedWorkerPreparationForMainFrame( 556 ServiceWorkerMetrics::RecordActivatedWorkerPreparationForMainFrame(
557 worker_ready_time_ - request()->creation_time(), initial_worker_status_, 557 worker_ready_time_ - request()->creation_time(), initial_worker_status_,
558 worker_start_situation_, did_navigation_preload_); 558 worker_start_situation_, did_navigation_preload_);
559 MaybeReportNavigationPreloadMetrics(); 559 MaybeReportNavigationPreloadMetrics();
560 } 560 }
561 561
562 void ServiceWorkerURLRequestJob::DidDispatchFetchEvent( 562 void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
563 ServiceWorkerStatusCode status, 563 ServiceWorkerStatusCode status,
564 ServiceWorkerFetchEventResult fetch_result, 564 ServiceWorkerFetchEventResult fetch_result,
565 const ServiceWorkerResponse& response, 565 const ServiceWorkerResponse& response,
566 blink::mojom::ServiceWorkerStreamHandlePtr stream_handle,
566 const scoped_refptr<ServiceWorkerVersion>& version) { 567 const scoped_refptr<ServiceWorkerVersion>& version) {
567 // Do not clear |fetch_dispatcher_| if it has dispatched a navigation preload 568 // Do not clear |fetch_dispatcher_| if it has dispatched a navigation preload
568 // request to keep the mojom::URLLoader related objects in it, because the 569 // request to keep the mojom::URLLoader related objects in it, because the
569 // preload response might still need to be streamed even after calling 570 // preload response might still need to be streamed even after calling
570 // respondWith(). 571 // respondWith().
571 if (!did_navigation_preload_) { 572 if (!did_navigation_preload_) {
572 fetch_dispatcher_.reset(); 573 fetch_dispatcher_.reset();
573 } 574 }
574 ServiceWorkerMetrics::RecordFetchEventStatus(IsMainResourceLoad(), status); 575 ServiceWorkerMetrics::RecordFetchEventStatus(IsMainResourceLoad(), status);
575 576
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 // HttpResponseInfo to show HTTPS padlock. 622 // HttpResponseInfo to show HTTPS padlock.
622 // TODO(horo): When we support mixed-content (HTTP) no-cors requests from a 623 // TODO(horo): When we support mixed-content (HTTP) no-cors requests from a
623 // ServiceWorker, we have to check the security level of the responses. 624 // ServiceWorker, we have to check the security level of the responses.
624 DCHECK(!http_response_info_); 625 DCHECK(!http_response_info_);
625 DCHECK(version); 626 DCHECK(version);
626 const net::HttpResponseInfo* main_script_http_info = 627 const net::HttpResponseInfo* main_script_http_info =
627 version->GetMainScriptHttpResponseInfo(); 628 version->GetMainScriptHttpResponseInfo();
628 DCHECK(main_script_http_info); 629 DCHECK(main_script_http_info);
629 http_response_info_.reset(new net::HttpResponseInfo(*main_script_http_info)); 630 http_response_info_.reset(new net::HttpResponseInfo(*main_script_http_info));
630 631
631 // Set up a request for reading the stream. 632 // Process stream using mojo's data pipe.
632 if (response.stream_url.is_valid()) { 633 if (!stream_handle.is_null()) {
633 DCHECK(response.blob_uuid.empty());
634 SetResponseBodyType(STREAM); 634 SetResponseBodyType(STREAM);
635 SetResponse(response); 635 SetResponse(response);
636 stream_reader_.reset(new ServiceWorkerStreamReader(this, version)); 636 data_pipe_reader_.reset(new ServiceWorkerDataPipeReader(
637 stream_reader_->Start(response.stream_url); 637 this, version, std::move(stream_handle)));
638 data_pipe_reader_->Start();
638 return; 639 return;
639 } 640 }
640 641
641 // Set up a request for reading the blob. 642 // Set up a request for reading the blob.
642 if (!response.blob_uuid.empty() && blob_storage_context_) { 643 if (!response.blob_uuid.empty() && blob_storage_context_) {
643 SetResponseBodyType(BLOB); 644 SetResponseBodyType(BLOB);
644 std::unique_ptr<storage::BlobDataHandle> blob_data_handle = 645 std::unique_ptr<storage::BlobDataHandle> blob_data_handle =
645 blob_storage_context_->GetBlobDataFromUUID(response.blob_uuid); 646 blob_storage_context_->GetBlobDataFromUUID(response.blob_uuid);
646 if (!blob_data_handle) { 647 if (!blob_data_handle) {
647 // The renderer gave us a bad blob UUID. 648 // The renderer gave us a bad blob UUID.
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 DCHECK(!reported_navigation_preload_metrics_); 909 DCHECK(!reported_navigation_preload_metrics_);
909 reported_navigation_preload_metrics_ = true; 910 reported_navigation_preload_metrics_ = true;
910 911
911 ServiceWorkerMetrics::RecordNavigationPreloadResponse( 912 ServiceWorkerMetrics::RecordNavigationPreloadResponse(
912 worker_ready_time_ - worker_start_time_, 913 worker_ready_time_ - worker_start_time_,
913 navigation_preload_response_time_ - worker_start_time_, 914 navigation_preload_response_time_ - worker_start_time_,
914 initial_worker_status_, worker_start_situation_); 915 initial_worker_status_, worker_start_situation_);
915 } 916 }
916 917
917 } // namespace content 918 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698