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

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

Issue 2465813003: Stop using MojoURLLoaderFactoryGetter. (Closed)
Patch Set: 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_fetch_dispatcher.h" 5 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/feature_list.h" 11 #include "base/feature_list.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "base/trace_event/trace_event.h" 13 #include "base/trace_event/trace_event.h"
14 #include "content/browser/loader/resource_dispatcher_host_impl.h" 14 #include "content/browser/loader/resource_dispatcher_host_impl.h"
15 #include "content/browser/loader/resource_message_filter.h"
15 #include "content/browser/loader/resource_request_info_impl.h" 16 #include "content/browser/loader/resource_request_info_impl.h"
17 #include "content/browser/loader/url_loader_factory_impl.h"
16 #include "content/browser/service_worker/embedded_worker_status.h" 18 #include "content/browser/service_worker/embedded_worker_status.h"
17 #include "content/browser/service_worker/service_worker_version.h" 19 #include "content/browser/service_worker/service_worker_version.h"
18 #include "content/common/service_worker/fetch_event_dispatcher.mojom.h" 20 #include "content/common/service_worker/fetch_event_dispatcher.mojom.h"
19 #include "content/common/service_worker/service_worker_messages.h" 21 #include "content/common/service_worker/service_worker_messages.h"
20 #include "content/common/service_worker/service_worker_status_code.h" 22 #include "content/common/service_worker/service_worker_status_code.h"
21 #include "content/common/service_worker/service_worker_types.h" 23 #include "content/common/service_worker/service_worker_types.h"
22 #include "content/common/service_worker/service_worker_utils.h" 24 #include "content/common/service_worker/service_worker_utils.h"
23 #include "content/common/url_loader.mojom.h" 25 #include "content/common/url_loader.mojom.h"
24 #include "content/common/url_loader_factory.mojom.h" 26 #include "content/common/url_loader_factory.mojom.h"
25 #include "content/public/common/browser_side_navigation_policy.h" 27 #include "content/public/common/browser_side_navigation_policy.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 net_log_.EndEvent( 274 net_log_.EndEvent(
273 net::NetLogEventType::SERVICE_WORKER_DISPATCH_FETCH_EVENT, 275 net::NetLogEventType::SERVICE_WORKER_DISPATCH_FETCH_EVENT,
274 base::Bind(&NetLogFetchEventCallback, status, fetch_result)); 276 base::Bind(&NetLogFetchEventCallback, status, fetch_result));
275 277
276 FetchCallback fetch_callback = fetch_callback_; 278 FetchCallback fetch_callback = fetch_callback_;
277 scoped_refptr<ServiceWorkerVersion> version = version_; 279 scoped_refptr<ServiceWorkerVersion> version = version_;
278 fetch_callback.Run(status, fetch_result, response, version); 280 fetch_callback.Run(status, fetch_result, response, version);
279 } 281 }
280 282
281 void ServiceWorkerFetchDispatcher::MaybeStartNavigationPreload( 283 void ServiceWorkerFetchDispatcher::MaybeStartNavigationPreload(
282 net::URLRequest* original_request, 284 net::URLRequest* original_request) {
283 const MojoURLLoaderFactoryGetter& url_loader_factory_getter) {
284 if (resource_type_ != RESOURCE_TYPE_MAIN_FRAME && 285 if (resource_type_ != RESOURCE_TYPE_MAIN_FRAME &&
285 resource_type_ != RESOURCE_TYPE_SUB_FRAME) { 286 resource_type_ != RESOURCE_TYPE_SUB_FRAME) {
286 return; 287 return;
287 } 288 }
288 if (!version_->navigation_preload_enabled()) 289 if (!version_->navigation_preload_enabled())
289 return; 290 return;
290 // TODO(horo): Currently NavigationPreload doesn't support request body. 291 // TODO(horo): Currently NavigationPreload doesn't support request body.
291 if (!request_->blob_uuid.empty()) 292 if (!request_->blob_uuid.empty())
292 return; 293 return;
293 if (!base::FeatureList::IsEnabled( 294 if (!base::FeatureList::IsEnabled(
294 features::kServiceWorkerNavigationPreload)) { 295 features::kServiceWorkerNavigationPreload)) {
295 // TODO(horo): Check |version_|'s origin_trial_tokens() here if we use 296 // TODO(horo): Check |version_|'s origin_trial_tokens() here if we use
296 // Origin-Trial for NavigationPreload. 297 // Origin-Trial for NavigationPreload.
297 return; 298 return;
298 } 299 }
299 if (IsBrowserSideNavigationEnabled()) { 300 if (IsBrowserSideNavigationEnabled()) {
300 // TODO(horo): Support NavigationPreload with PlzNavigate. 301 // TODO(horo): Support NavigationPreload with PlzNavigate.
301 NOTIMPLEMENTED(); 302 NOTIMPLEMENTED();
302 return; 303 return;
303 } 304 }
304 DCHECK(!url_loader_factory_getter.is_null()); 305
306 const ResourceRequestInfoImpl* original_info =
307 ResourceRequestInfoImpl::ForRequest(original_request);
308 if (!original_info->filter())
309 return;
305 mojom::URLLoaderFactoryPtr factory; 310 mojom::URLLoaderFactoryPtr factory;
306 url_loader_factory_getter.Run(mojo::GetProxy(&factory)); 311 URLLoaderFactoryImpl::Create(original_info->filter(),
307 if (url_loader_factory_getter.IsCancelled()) 312 mojo::GetProxy(&factory));
308 return;
309 313
310 preload_handle_ = mojom::FetchEventPreloadHandle::New(); 314 preload_handle_ = mojom::FetchEventPreloadHandle::New();
311 const ResourceRequestInfoImpl* original_info =
312 ResourceRequestInfoImpl::ForRequest(original_request);
313 315
314 mojom::URLLoaderClientPtr url_loader_client; 316 mojom::URLLoaderClientPtr url_loader_client;
315 preload_handle_->url_loader_client_request = GetProxy(&url_loader_client); 317 preload_handle_->url_loader_client_request = GetProxy(&url_loader_client);
316 318
317 ResourceRequest request; 319 ResourceRequest request;
318 request.method = original_request->method(); 320 request.method = original_request->method();
319 request.url = original_request->url(); 321 request.url = original_request->url();
320 request.referrer = GURL(original_request->referrer()); 322 request.referrer = GURL(original_request->referrer());
321 request.referrer_policy = original_info->GetReferrerPolicy(); 323 request.referrer_policy = original_info->GetReferrerPolicy();
322 request.visibility_state = original_info->GetVisibilityState(); 324 request.visibility_state = original_info->GetVisibilityState();
(...skipping 17 matching lines...) Expand all
340 } 342 }
341 343
342 ServiceWorkerMetrics::EventType ServiceWorkerFetchDispatcher::GetEventType() 344 ServiceWorkerMetrics::EventType ServiceWorkerFetchDispatcher::GetEventType()
343 const { 345 const {
344 if (request_->fetch_type == ServiceWorkerFetchType::FOREIGN_FETCH) 346 if (request_->fetch_type == ServiceWorkerFetchType::FOREIGN_FETCH)
345 return ServiceWorkerMetrics::EventType::FOREIGN_FETCH; 347 return ServiceWorkerMetrics::EventType::FOREIGN_FETCH;
346 return ResourceTypeToEventType(resource_type_); 348 return ResourceTypeToEventType(resource_type_);
347 } 349 }
348 350
349 } // namespace content 351 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698