| Index: content/browser/loader/resource_dispatcher_host_impl.cc
|
| diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
|
| index 71577dc8cdccd795cb80afd653e2195c2e259c0b..51c00f411d03fa1c49c4f52445e864c09f54884f 100644
|
| --- a/content/browser/loader/resource_dispatcher_host_impl.cc
|
| +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
|
| @@ -1539,12 +1539,12 @@ void ResourceDispatcherHostImpl::ContinuePendingBeginRequest(
|
|
|
| // Initialize the service worker handler for the request. We don't use
|
| // ServiceWorker for synchronous loads to avoid renderer deadlocks.
|
| - const SkipServiceWorker should_skip_service_worker =
|
| - is_sync_load ? SkipServiceWorker::ALL : request_data.skip_service_worker;
|
| + const ServiceWorkerMode service_worker_mode =
|
| + is_sync_load ? ServiceWorkerMode::NONE : request_data.service_worker_mode;
|
| ServiceWorkerRequestHandler::InitializeHandler(
|
| new_request.get(), requester_info->service_worker_context(), blob_context,
|
| child_id, request_data.service_worker_provider_id,
|
| - should_skip_service_worker != SkipServiceWorker::NONE,
|
| + service_worker_mode != ServiceWorkerMode::ALL,
|
| request_data.fetch_request_mode, request_data.fetch_credentials_mode,
|
| request_data.fetch_redirect_mode, request_data.resource_type,
|
| request_data.fetch_request_context_type, request_data.fetch_frame_type,
|
| @@ -1552,12 +1552,11 @@ void ResourceDispatcherHostImpl::ContinuePendingBeginRequest(
|
|
|
| ForeignFetchRequestHandler::InitializeHandler(
|
| new_request.get(), requester_info->service_worker_context(), blob_context,
|
| - child_id, request_data.service_worker_provider_id,
|
| - should_skip_service_worker, request_data.fetch_request_mode,
|
| - request_data.fetch_credentials_mode, request_data.fetch_redirect_mode,
|
| - request_data.resource_type, request_data.fetch_request_context_type,
|
| - request_data.fetch_frame_type, request_data.request_body,
|
| - request_data.initiated_in_secure_context);
|
| + child_id, request_data.service_worker_provider_id, service_worker_mode,
|
| + request_data.fetch_request_mode, request_data.fetch_credentials_mode,
|
| + request_data.fetch_redirect_mode, request_data.resource_type,
|
| + request_data.fetch_request_context_type, request_data.fetch_frame_type,
|
| + request_data.request_body, request_data.initiated_in_secure_context);
|
|
|
| // Have the appcache associate its extra info with the request.
|
| AppCacheInterceptor::SetExtraRequestInfo(
|
|
|