OLD | NEW |
---|---|
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/renderer/shared_worker/embedded_shared_worker_stub.h" | 5 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
265 blink::WebServiceWorkerNetworkProvider* web_network_provider) { | 265 blink::WebServiceWorkerNetworkProvider* web_network_provider) { |
266 DCHECK(base::FeatureList::IsEnabled(features::kOffMainThreadFetch)); | 266 DCHECK(base::FeatureList::IsEnabled(features::kOffMainThreadFetch)); |
267 mojom::WorkerURLLoaderFactoryProviderPtr worker_url_loader_factory_provider; | 267 mojom::WorkerURLLoaderFactoryProviderPtr worker_url_loader_factory_provider; |
268 RenderThreadImpl::current() | 268 RenderThreadImpl::current() |
269 ->blink_platform_impl() | 269 ->blink_platform_impl() |
270 ->GetInterfaceProvider() | 270 ->GetInterfaceProvider() |
271 ->GetInterface(mojo::MakeRequest(&worker_url_loader_factory_provider)); | 271 ->GetInterface(mojo::MakeRequest(&worker_url_loader_factory_provider)); |
272 std::unique_ptr<WorkerFetchContextImpl> worker_fetch_context = | 272 std::unique_ptr<WorkerFetchContextImpl> worker_fetch_context = |
273 base::MakeUnique<WorkerFetchContextImpl>( | 273 base::MakeUnique<WorkerFetchContextImpl>( |
274 worker_url_loader_factory_provider.PassInterface()); | 274 worker_url_loader_factory_provider.PassInterface()); |
275 // TODO(horo): Currently we treat the worker context as secure if the origin | |
276 // of the shared worker script url is secure. But according to the spec, if | |
277 // the creation context is not secure, we should treat the worker as | |
278 // non-secure. crbug.com/723575 | |
falken
2017/05/18 02:14:13
just to confirm, this is not a regression with off
horo
2017/05/18 03:59:53
Yes this is an existing bug even without OffMainTh
| |
279 // https://www.w3.org/TR/secure-contexts/#examples-shared-workers | |
falken
2017/05/18 02:14:13
link to the newest spec:
https://w3c.github.io/web
horo
2017/05/18 03:59:53
Done.
| |
280 worker_fetch_context->set_is_secure_context(IsOriginSecure(url_)); | |
275 if (web_network_provider) { | 281 if (web_network_provider) { |
276 ServiceWorkerNetworkProvider* network_provider = | 282 ServiceWorkerNetworkProvider* network_provider = |
277 ServiceWorkerNetworkProvider::FromWebServiceWorkerNetworkProvider( | 283 ServiceWorkerNetworkProvider::FromWebServiceWorkerNetworkProvider( |
278 web_network_provider); | 284 web_network_provider); |
279 worker_fetch_context->set_service_worker_provider_id( | 285 worker_fetch_context->set_service_worker_provider_id( |
280 network_provider->provider_id()); | 286 network_provider->provider_id()); |
281 worker_fetch_context->set_is_controlled_by_service_worker( | 287 worker_fetch_context->set_is_controlled_by_service_worker( |
282 network_provider->IsControlledByServiceWorker()); | 288 network_provider->IsControlledByServiceWorker()); |
283 } | 289 } |
284 return std::move(worker_fetch_context); | 290 return std::move(worker_fetch_context); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
317 } | 323 } |
318 } | 324 } |
319 | 325 |
320 void EmbeddedSharedWorkerStub::OnTerminateWorkerContext() { | 326 void EmbeddedSharedWorkerStub::OnTerminateWorkerContext() { |
321 // After this we wouldn't get any IPC for this stub. | 327 // After this we wouldn't get any IPC for this stub. |
322 running_ = false; | 328 running_ = false; |
323 impl_->TerminateWorkerContext(); | 329 impl_->TerminateWorkerContext(); |
324 } | 330 } |
325 | 331 |
326 } // namespace content | 332 } // namespace content |
OLD | NEW |