| 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 c49bfe9a4c3b6431a9fe5a5ae1210af8e5608e0f..ddfb39d80f8affa2f8488449a43ee8888514d3ef 100644
|
| --- a/content/browser/loader/resource_dispatcher_host_impl.cc
|
| +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
|
| @@ -1138,14 +1138,15 @@ void ResourceDispatcherHostImpl::BeginRequest(
|
| new_request->url()));
|
| }
|
|
|
| - // Initialize the service worker handler for the request.
|
| + // Initialize the service worker handler for the request. We don't use
|
| + // ServiceWorker for synchronous loads to avoid renderer deadlocks.
|
| ServiceWorkerRequestHandler::InitializeHandler(
|
| new_request.get(),
|
| filter_->service_worker_context(),
|
| blob_context,
|
| child_id,
|
| request_data.service_worker_provider_id,
|
| - request_data.skip_service_worker,
|
| + request_data.skip_service_worker || is_sync_load,
|
| request_data.resource_type,
|
| request_data.request_body);
|
|
|
|
|