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

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

Issue 2448353002: [BlobAsync] Moving async handling into BlobStorageContext & quota out. (Closed)
Patch Set: Fixed unused function Created 4 years, 1 month 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 <limits>
11 #include <map> 10 #include <map>
12 #include <string> 11 #include <string>
13 #include <utility> 12 #include <utility>
14 #include <vector> 13 #include <vector>
15 14
16 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/files/file_util.h"
17 #include "base/guid.h" 17 #include "base/guid.h"
18 #include "base/location.h" 18 #include "base/location.h"
19 #include "base/single_thread_task_runner.h" 19 #include "base/single_thread_task_runner.h"
20 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
21 #include "base/task_runner.h"
22 #include "base/task_runner_util.h"
21 #include "base/threading/thread_task_runner_handle.h" 23 #include "base/threading/thread_task_runner_handle.h"
22 #include "base/time/time.h" 24 #include "base/time/time.h"
23 #include "content/browser/resource_context_impl.h" 25 #include "content/browser/resource_context_impl.h"
24 #include "content/browser/service_worker/embedded_worker_instance.h" 26 #include "content/browser/service_worker/embedded_worker_instance.h"
25 #include "content/browser/service_worker/service_worker_blob_reader.h" 27 #include "content/browser/service_worker/service_worker_blob_reader.h"
26 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" 28 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
27 #include "content/browser/service_worker/service_worker_provider_host.h" 29 #include "content/browser/service_worker/service_worker_provider_host.h"
28 #include "content/browser/service_worker/service_worker_response_info.h" 30 #include "content/browser/service_worker/service_worker_response_info.h"
29 #include "content/browser/service_worker/service_worker_stream_reader.h" 31 #include "content/browser/service_worker/service_worker_stream_reader.h"
30 #include "content/common/resource_request_body_impl.h" 32 #include "content/common/resource_request_body_impl.h"
31 #include "content/common/service_worker/service_worker_types.h" 33 #include "content/common/service_worker/service_worker_types.h"
32 #include "content/common/service_worker/service_worker_utils.h" 34 #include "content/common/service_worker/service_worker_utils.h"
33 #include "content/public/browser/blob_handle.h" 35 #include "content/public/browser/blob_handle.h"
36 #include "content/public/browser/browser_thread.h"
34 #include "content/public/browser/resource_request_info.h" 37 #include "content/public/browser/resource_request_info.h"
35 #include "content/public/browser/service_worker_context.h" 38 #include "content/public/browser/service_worker_context.h"
36 #include "content/public/common/referrer.h" 39 #include "content/public/common/referrer.h"
37 #include "net/base/net_errors.h" 40 #include "net/base/net_errors.h"
38 #include "net/http/http_request_headers.h" 41 #include "net/http/http_request_headers.h"
39 #include "net/http/http_response_headers.h" 42 #include "net/http/http_response_headers.h"
40 #include "net/http/http_response_info.h" 43 #include "net/http/http_response_info.h"
41 #include "net/http/http_util.h" 44 #include "net/http/http_util.h"
42 #include "net/log/net_log.h" 45 #include "net/log/net_log.h"
43 #include "net/log/net_log_event_type.h" 46 #include "net/log/net_log_event_type.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 case m::REQUEST_JOB_ERROR_DESTROYED_WITH_BLOB: 100 case m::REQUEST_JOB_ERROR_DESTROYED_WITH_BLOB:
98 case m::REQUEST_JOB_ERROR_DESTROYED_WITH_STREAM: 101 case m::REQUEST_JOB_ERROR_DESTROYED_WITH_STREAM:
99 // Invalid type. 102 // Invalid type.
100 case m::NUM_REQUEST_JOB_RESULT_TYPES: 103 case m::NUM_REQUEST_JOB_RESULT_TYPES:
101 NOTREACHED() << result; 104 NOTREACHED() << result;
102 } 105 }
103 NOTREACHED() << result; 106 NOTREACHED() << result;
104 return n::FAILED; 107 return n::FAILED;
105 } 108 }
106 109
110 std::vector<int64_t> GetFileSizesOnBlockingPool(
111 std::vector<base::FilePath> file_paths) {
112 std::vector<int64_t> sizes;
113 sizes.reserve(file_paths.size());
114 for (const base::FilePath& path : file_paths) {
115 base::File::Info file_info;
116 if (!base::GetFileInfo(path, &file_info))
117 return std::vector<int64_t>();
118 sizes.push_back(file_info.size);
119 }
120 return sizes;
121 }
122
107 } // namespace 123 } // namespace
108 124
109 class ServiceWorkerURLRequestJob::BlobConstructionWaiter { 125 class ServiceWorkerURLRequestJob::FileSizeResolver {
110 public: 126 public:
111 explicit BlobConstructionWaiter(ServiceWorkerURLRequestJob* owner) 127 explicit FileSizeResolver(ServiceWorkerURLRequestJob* owner)
112 : owner_(owner), weak_factory_(this) { 128 : owner_(owner), weak_factory_(this) {
113 TRACE_EVENT_ASYNC_BEGIN1("ServiceWorker", "BlobConstructionWaiter", this, 129 TRACE_EVENT_ASYNC_BEGIN1("ServiceWorker", "BlobFilesWaiter", this, "URL",
114 "URL", owner_->request()->url().spec()); 130 owner_->request()->url().spec());
115 owner_->request()->net_log().BeginEvent( 131 owner_->request()->net_log().BeginEvent(
116 net::NetLogEventType::SERVICE_WORKER_WAITING_FOR_REQUEST_BODY_BLOB); 132 net::NetLogEventType::SERVICE_WORKER_WAITING_FOR_REQUEST_BODY_FILES);
117 } 133 }
118 134
119 ~BlobConstructionWaiter() { 135 ~FileSizeResolver() {
120 owner_->request()->net_log().EndEvent( 136 owner_->request()->net_log().EndEvent(
121 net::NetLogEventType::SERVICE_WORKER_WAITING_FOR_REQUEST_BODY_BLOB, 137 net::NetLogEventType::SERVICE_WORKER_WAITING_FOR_REQUEST_BODY_FILES,
122 net::NetLog::BoolCallback("success", phase_ == Phase::SUCCESS)); 138 net::NetLog::BoolCallback("success", phase_ == Phase::SUCCESS));
123 TRACE_EVENT_ASYNC_END1("ServiceWorker", "BlobConstructionWaiter", this, 139 TRACE_EVENT_ASYNC_END1("ServiceWorker", "BlobFilesWaiter", this, "Success",
124 "Success", phase_ == Phase::SUCCESS); 140 phase_ == Phase::SUCCESS);
125 } 141 }
126 142
127 void RunOnComplete(const base::Callback<void(bool)>& callback) { 143 void RunOnComplete(base::TaskRunner* file_runner,
144 const base::Callback<void(bool)>& callback) {
128 DCHECK_EQ(static_cast<int>(Phase::INITIAL), static_cast<int>(phase_)); 145 DCHECK_EQ(static_cast<int>(Phase::INITIAL), static_cast<int>(phase_));
146 DCHECK(file_elements_.empty());
129 phase_ = Phase::WAITING; 147 phase_ = Phase::WAITING;
130 num_pending_request_body_blobs_ = 0; 148 body_ = owner_->body_;
131 callback_ = callback; 149 callback_ = callback;
132 150
133 for (const ResourceRequestBodyImpl::Element& element : 151 std::vector<base::FilePath> file_paths;
134 *(owner_->body_->elements())) { 152 for (ResourceRequestBodyImpl::Element& element : *body_->elements_mutable()) {
135 if (element.type() != ResourceRequestBodyImpl::Element::TYPE_BLOB) 153 if (element.type() == ResourceRequestBodyImpl::Element::TYPE_FILE &&
136 continue; 154 element.length() == ResourceRequestBodyImpl::Element::kUnknownSize) {
137 155 file_elements_.push_back(&element);
138 std::unique_ptr<storage::BlobDataHandle> handle = 156 file_paths.push_back(element.path());
139 owner_->blob_storage_context_->GetBlobDataFromUUID(
140 element.blob_uuid());
141 if (handle->IsBroken()) {
142 Complete(false);
143 return;
144 }
145 if (handle->IsBeingBuilt()) {
146 ++num_pending_request_body_blobs_;
147 handle->RunOnConstructionComplete(
148 base::Bind(&BlobConstructionWaiter::OneRequestBodyBlobCompleted,
149 weak_factory_.GetWeakPtr()));
150 } 157 }
151 } 158 }
159 if (file_elements_.empty()) {
160 Complete(true);
161 return;
162 }
152 163
153 if (num_pending_request_body_blobs_ == 0) 164 PostTaskAndReplyWithResult(
154 Complete(true); 165 file_runner, FROM_HERE,
166 base::Bind(&GetFileSizesOnBlockingPool, base::Passed(&file_paths)),
167 base::Bind(
168 &ServiceWorkerURLRequestJob::FileSizeResolver::OnFileSizesResolved,
169 weak_factory_.GetWeakPtr()));
155 } 170 }
156 171
157 private: 172 private:
158 enum class Phase { INITIAL, WAITING, SUCCESS, FAIL }; 173 enum class Phase { INITIAL, WAITING, SUCCESS, FAIL };
159 174
160 void OneRequestBodyBlobCompleted( 175 void OnFileSizesResolved(std::vector<int64_t> sizes) {
161 bool success, 176 bool success = !sizes.empty();
162 storage::IPCBlobCreationCancelCode cancel_code) { 177 if (success) {
163 DCHECK_GT(num_pending_request_body_blobs_, 0UL); 178 DCHECK_EQ(sizes.size(), file_elements_.size());
164 179 size_t num_elements = file_elements_.size();
165 if (success) 180 for (size_t i = 0; i < num_elements; i++) {
166 --num_pending_request_body_blobs_; 181 auto* element = file_elements_[i];
167 else 182 element->SetToFilePathRange(element->path(), element->offset(),
168 num_pending_request_body_blobs_ = 0; 183 static_cast<uint64_t>(sizes[i]),
169 184 element->expected_modification_time());
170 if (num_pending_request_body_blobs_ == 0) 185 }
171 Complete(success); 186 file_elements_.clear();
187 }
188 Complete(success);
172 } 189 }
173 190
174 void Complete(bool success) { 191 void Complete(bool success) {
175 DCHECK_EQ(static_cast<int>(Phase::WAITING), static_cast<int>(phase_)); 192 DCHECK_EQ(static_cast<int>(Phase::WAITING), static_cast<int>(phase_));
176 phase_ = success ? Phase::SUCCESS : Phase::FAIL; 193 phase_ = success ? Phase::SUCCESS : Phase::FAIL;
177 // Destroys |this|. 194 // Destroys |this|.
178 callback_.Run(success); 195 callback_.Run(success);
179 } 196 }
180 197
181 // Owns and must outlive |this|. 198 // Owns and must outlive |this|.
182 ServiceWorkerURLRequestJob* owner_; 199 ServiceWorkerURLRequestJob* owner_;
183 200
184 scoped_refptr<ResourceRequestBodyImpl> body_; 201 scoped_refptr<ResourceRequestBodyImpl> body_;
202 std::vector<ResourceRequestBodyImpl::Element*> file_elements_;
185 base::Callback<void(bool)> callback_; 203 base::Callback<void(bool)> callback_;
186 size_t num_pending_request_body_blobs_ = 0;
187 Phase phase_ = Phase::INITIAL; 204 Phase phase_ = Phase::INITIAL;
188 base::WeakPtrFactory<BlobConstructionWaiter> weak_factory_; 205 base::WeakPtrFactory<FileSizeResolver> weak_factory_;
189 206
190 DISALLOW_COPY_AND_ASSIGN(BlobConstructionWaiter); 207 DISALLOW_COPY_AND_ASSIGN(FileSizeResolver);
191 }; 208 };
192 209
193 bool ServiceWorkerURLRequestJob::Delegate::RequestStillValid( 210 bool ServiceWorkerURLRequestJob::Delegate::RequestStillValid(
194 ServiceWorkerMetrics::URLRequestJobResult* result) { 211 ServiceWorkerMetrics::URLRequestJobResult* result) {
195 return true; 212 return true;
196 } 213 }
197 214
198 ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob( 215 ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob(
199 net::URLRequest* request, 216 net::URLRequest* request,
200 net::NetworkDelegate* network_delegate, 217 net::NetworkDelegate* network_delegate,
(...skipping 27 matching lines...) Expand all
228 fall_back_required_(false), 245 fall_back_required_(false),
229 body_(body), 246 body_(body),
230 fetch_type_(fetch_type), 247 fetch_type_(fetch_type),
231 url_loader_factory_getter_(url_loader_factory_getter), 248 url_loader_factory_getter_(url_loader_factory_getter),
232 weak_factory_(this) { 249 weak_factory_(this) {
233 DCHECK(delegate_) << "ServiceWorkerURLRequestJob requires a delegate"; 250 DCHECK(delegate_) << "ServiceWorkerURLRequestJob requires a delegate";
234 } 251 }
235 252
236 ServiceWorkerURLRequestJob::~ServiceWorkerURLRequestJob() { 253 ServiceWorkerURLRequestJob::~ServiceWorkerURLRequestJob() {
237 stream_reader_.reset(); 254 stream_reader_.reset();
238 blob_construction_waiter_.reset(); 255 file_size_resolver_.reset();
239 256
240 if (!ShouldRecordResult()) 257 if (!ShouldRecordResult())
241 return; 258 return;
242 ServiceWorkerMetrics::URLRequestJobResult result = 259 ServiceWorkerMetrics::URLRequestJobResult result =
243 ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED; 260 ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED;
244 if (response_body_type_ == STREAM) 261 if (response_body_type_ == STREAM)
245 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_STREAM; 262 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_STREAM;
246 else if (response_body_type_ == BLOB) 263 else if (response_body_type_ == BLOB)
247 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_BLOB; 264 result = ServiceWorkerMetrics::REQUEST_JOB_ERROR_KILLED_WITH_BLOB;
248 RecordResult(result); 265 RecordResult(result);
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 case FALLBACK_TO_NETWORK: 424 case FALLBACK_TO_NETWORK:
408 FinalizeFallbackToNetwork(); 425 FinalizeFallbackToNetwork();
409 return; 426 return;
410 427
411 case FALLBACK_TO_RENDERER: 428 case FALLBACK_TO_RENDERER:
412 FinalizeFallbackToRenderer(); 429 FinalizeFallbackToRenderer();
413 return; 430 return;
414 431
415 case FORWARD_TO_SERVICE_WORKER: 432 case FORWARD_TO_SERVICE_WORKER:
416 if (HasRequestBody()) { 433 if (HasRequestBody()) {
417 DCHECK(!blob_construction_waiter_); 434 DCHECK(!file_size_resolver_);
418 blob_construction_waiter_.reset(new BlobConstructionWaiter(this)); 435 file_size_resolver_.reset(new FileSizeResolver(this));
419 blob_construction_waiter_->RunOnComplete( 436 file_size_resolver_->RunOnComplete(
437 BrowserThread::GetBlockingPool(),
420 base::Bind(&ServiceWorkerURLRequestJob::RequestBodyBlobsCompleted, 438 base::Bind(&ServiceWorkerURLRequestJob::RequestBodyBlobsCompleted,
421 GetWeakPtr())); 439 GetWeakPtr()));
422 return; 440 return;
423 } 441 }
424 442
425 RequestBodyBlobsCompleted(true); 443 RequestBodyBlobsCompleted(true);
426 return; 444 return;
427 } 445 }
428 446
429 NOTREACHED(); 447 NOTREACHED();
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 request->referrer = 485 request->referrer =
468 Referrer(GURL(request_->referrer()), blink::WebReferrerPolicyDefault); 486 Referrer(GURL(request_->referrer()), blink::WebReferrerPolicyDefault);
469 } 487 }
470 request->fetch_type = fetch_type_; 488 request->fetch_type = fetch_type_;
471 return request; 489 return request;
472 } 490 }
473 491
474 void ServiceWorkerURLRequestJob::CreateRequestBodyBlob(std::string* blob_uuid, 492 void ServiceWorkerURLRequestJob::CreateRequestBodyBlob(std::string* blob_uuid,
475 uint64_t* blob_size) { 493 uint64_t* blob_size) {
476 DCHECK(HasRequestBody()); 494 DCHECK(HasRequestBody());
477 // To ensure the blobs stick around until the end of the reading. 495 const std::string uuid(base::GenerateGUID());
478 std::vector<std::unique_ptr<storage::BlobDataHandle>> handles; 496 storage::BlobDataBuilder blob_builder(uuid);
479 std::vector<std::unique_ptr<storage::BlobDataSnapshot>> snapshots;
480 // TODO(dmurph): Allow blobs to be added below, so that the context can
481 // efficiently re-use blob items for the new blob.
482 std::vector<const ResourceRequestBodyImpl::Element*> resolved_elements;
483 for (const ResourceRequestBodyImpl::Element& element : (*body_->elements())) { 497 for (const ResourceRequestBodyImpl::Element& element : (*body_->elements())) {
484 if (element.type() != ResourceRequestBodyImpl::Element::TYPE_BLOB) { 498 blob_builder.AppendIPCDataElement(element);
485 resolved_elements.push_back(&element);
486 continue;
487 }
488 std::unique_ptr<storage::BlobDataHandle> handle =
489 blob_storage_context_->GetBlobDataFromUUID(element.blob_uuid());
490 std::unique_ptr<storage::BlobDataSnapshot> snapshot =
491 handle->CreateSnapshot();
492 if (snapshot->items().empty())
493 continue;
494 const auto& items = snapshot->items();
495 for (const auto& item : items) {
496 DCHECK_NE(storage::DataElement::TYPE_BLOB, item->type());
497 resolved_elements.push_back(item->data_element_ptr());
498 }
499 handles.push_back(std::move(handle));
500 snapshots.push_back(std::move(snapshot));
501 }
502
503 const std::string uuid(base::GenerateGUID());
504 uint64_t total_size = 0;
505
506 storage::BlobDataBuilder blob_builder(uuid);
507 for (size_t i = 0; i < resolved_elements.size(); ++i) {
508 const ResourceRequestBodyImpl::Element& element = *resolved_elements[i];
509 if (total_size != std::numeric_limits<uint64_t>::max() &&
510 element.length() != std::numeric_limits<uint64_t>::max())
511 total_size += element.length();
512 else
513 total_size = std::numeric_limits<uint64_t>::max();
514 switch (element.type()) {
515 case ResourceRequestBodyImpl::Element::TYPE_BYTES:
516 blob_builder.AppendData(element.bytes(), element.length());
517 break;
518 case ResourceRequestBodyImpl::Element::TYPE_FILE:
519 blob_builder.AppendFile(element.path(), element.offset(),
520 element.length(),
521 element.expected_modification_time());
522 break;
523 case ResourceRequestBodyImpl::Element::TYPE_BLOB:
524 // Blob elements should be resolved beforehand.
525 NOTREACHED();
526 break;
527 case ResourceRequestBodyImpl::Element::TYPE_FILE_FILESYSTEM:
528 blob_builder.AppendFileSystemFile(element.filesystem_url(),
529 element.offset(), element.length(),
530 element.expected_modification_time());
531 break;
532 default:
533 NOTIMPLEMENTED();
534 }
535 } 499 }
536 500
537 request_body_blob_data_handle_ = 501 request_body_blob_data_handle_ =
538 blob_storage_context_->AddFinishedBlob(&blob_builder); 502 blob_storage_context_->AddFinishedBlob(&blob_builder);
539 *blob_uuid = uuid; 503 *blob_uuid = blob_builder.uuid();
540 *blob_size = total_size; 504 *blob_size = request_body_blob_data_handle_->size();
541 } 505 }
542 506
543 void ServiceWorkerURLRequestJob::DidPrepareFetchEvent( 507 void ServiceWorkerURLRequestJob::DidPrepareFetchEvent(
544 scoped_refptr<ServiceWorkerVersion> version) { 508 scoped_refptr<ServiceWorkerVersion> version) {
545 worker_ready_time_ = base::TimeTicks::Now(); 509 worker_ready_time_ = base::TimeTicks::Now();
546 load_timing_info_.send_start = worker_ready_time_; 510 load_timing_info_.send_start = worker_ready_time_;
547 511
548 // Record the time taken for the browser to find and possibly start an active 512 // Record the time taken for the browser to find and possibly start an active
549 // worker to which to dispatch a FetchEvent for a main frame resource request. 513 // worker to which to dispatch a FetchEvent for a main frame resource request.
550 // For context, a FetchEvent can only be dispatched to an ACTIVATED worker 514 // For context, a FetchEvent can only be dispatched to an ACTIVATED worker
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 return ServiceWorkerUtils::IsMainResourceType(resource_type_); 818 return ServiceWorkerUtils::IsMainResourceType(resource_type_);
855 } 819 }
856 820
857 bool ServiceWorkerURLRequestJob::HasRequestBody() { 821 bool ServiceWorkerURLRequestJob::HasRequestBody() {
858 // URLRequest::has_upload() must be checked since its upload data may have 822 // URLRequest::has_upload() must be checked since its upload data may have
859 // been cleared while handling a redirect. 823 // been cleared while handling a redirect.
860 return request_->has_upload() && body_.get() && blob_storage_context_; 824 return request_->has_upload() && body_.get() && blob_storage_context_;
861 } 825 }
862 826
863 void ServiceWorkerURLRequestJob::RequestBodyBlobsCompleted(bool success) { 827 void ServiceWorkerURLRequestJob::RequestBodyBlobsCompleted(bool success) {
864 blob_construction_waiter_.reset(); 828 file_size_resolver_.reset();
865 if (!success) { 829 if (!success) {
866 RecordResult( 830 RecordResult(
867 ServiceWorkerMetrics::REQUEST_JOB_ERROR_REQUEST_BODY_BLOB_FAILED); 831 ServiceWorkerMetrics::REQUEST_JOB_ERROR_REQUEST_BODY_BLOB_FAILED);
868 // TODO(falken): This and below should probably be NotifyStartError, not 832 // TODO(falken): This and below should probably be NotifyStartError, not
869 // DeliverErrorResponse. But changing it causes 833 // DeliverErrorResponse. But changing it causes
870 // ServiceWorkerURLRequestJobTest.DeletedProviderHostBeforeFetchEvent to 834 // ServiceWorkerURLRequestJobTest.DeletedProviderHostBeforeFetchEvent to
871 // fail. 835 // fail.
872 DeliverErrorResponse(); 836 DeliverErrorResponse();
873 return; 837 return;
874 } 838 }
(...skipping 19 matching lines...) Expand all
894 weak_factory_.GetWeakPtr(), active_worker), 858 weak_factory_.GetWeakPtr(), active_worker),
895 base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent, 859 base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent,
896 weak_factory_.GetWeakPtr()))); 860 weak_factory_.GetWeakPtr())));
897 worker_start_time_ = base::TimeTicks::Now(); 861 worker_start_time_ = base::TimeTicks::Now();
898 fetch_dispatcher_->MaybeStartNavigationPreload(request(), 862 fetch_dispatcher_->MaybeStartNavigationPreload(request(),
899 url_loader_factory_getter_); 863 url_loader_factory_getter_);
900 fetch_dispatcher_->Run(); 864 fetch_dispatcher_->Run();
901 } 865 }
902 866
903 } // namespace content 867 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698