OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 13 matching lines...) Expand all Loading... | |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "web/DedicatedWorkerMessagingProxyProviderImpl.h" | 31 #include "web/DedicatedWorkerMessagingProxyProviderImpl.h" |
32 | 32 |
33 #include "core/dom/Document.h" | 33 #include "core/dom/Document.h" |
34 #include "core/loader/WorkerFetchContext.h" | |
34 #include "core/workers/DedicatedWorkerMessagingProxy.h" | 35 #include "core/workers/DedicatedWorkerMessagingProxy.h" |
35 #include "core/workers/Worker.h" | 36 #include "core/workers/Worker.h" |
36 #include "core/workers/WorkerClients.h" | 37 #include "core/workers/WorkerClients.h" |
37 #include "platform/wtf/PtrUtil.h" | 38 #include "platform/wtf/PtrUtil.h" |
39 #include "public/platform/Platform.h" | |
38 #include "public/platform/WebContentSettingsClient.h" | 40 #include "public/platform/WebContentSettingsClient.h" |
39 #include "public/platform/WebString.h" | 41 #include "public/platform/WebString.h" |
40 #include "public/web/WebFrameClient.h" | 42 #include "public/web/WebFrameClient.h" |
41 #include "public/web/WebWorkerContentSettingsClientProxy.h" | 43 #include "public/web/WebWorkerContentSettingsClientProxy.h" |
42 #include "web/IndexedDBClientImpl.h" | 44 #include "web/IndexedDBClientImpl.h" |
43 #include "web/LocalFileSystemClient.h" | 45 #include "web/LocalFileSystemClient.h" |
44 #include "web/WebLocalFrameImpl.h" | 46 #include "web/WebLocalFrameImpl.h" |
45 #include "web/WebViewImpl.h" | 47 #include "web/WebViewImpl.h" |
46 #include "web/WorkerContentSettingsClient.h" | 48 #include "web/WorkerContentSettingsClient.h" |
47 | 49 |
(...skipping 12 matching lines...) Expand all Loading... | |
60 WebLocalFrameImpl::FromFrame(document->GetFrame()); | 62 WebLocalFrameImpl::FromFrame(document->GetFrame()); |
61 WorkerClients* worker_clients = WorkerClients::Create(); | 63 WorkerClients* worker_clients = WorkerClients::Create(); |
62 ProvideIndexedDBClientToWorker( | 64 ProvideIndexedDBClientToWorker( |
63 worker_clients, IndexedDBClientImpl::Create(*worker_clients)); | 65 worker_clients, IndexedDBClientImpl::Create(*worker_clients)); |
64 ProvideLocalFileSystemToWorker(worker_clients, | 66 ProvideLocalFileSystemToWorker(worker_clients, |
65 LocalFileSystemClient::Create()); | 67 LocalFileSystemClient::Create()); |
66 ProvideContentSettingsClientToWorker( | 68 ProvideContentSettingsClientToWorker( |
67 worker_clients, | 69 worker_clients, |
68 WTF::WrapUnique( | 70 WTF::WrapUnique( |
69 web_frame->Client()->CreateWorkerContentSettingsClientProxy())); | 71 web_frame->Client()->CreateWorkerContentSettingsClientProxy())); |
72 std::unique_ptr<WebWorkerFetchContext> web_worker_fetch_context = | |
73 Platform::Current()->CreateWorkerFetchContext(); | |
74 // |web_worker_fetch_context| is null if off-main-thread-fetch is disabled. | |
nhiroki
2017/04/18 07:56:41
If possible, I'd prefer to avoid checking the feat
horo
2017/04/18 12:53:34
Done.
| |
75 if (web_worker_fetch_context) { | |
76 // TODO(horo): Set more information about the context (ex: Service Worker | |
77 // provider ID) to |web_worker_fetch_context|. | |
78 ProvideWorkerFetchContextToWorker(worker_clients, | |
79 std::move(web_worker_fetch_context)); | |
kinuko
2017/04/18 08:35:37
I really don't think we need to use supplement her
horo
2017/04/18 12:53:34
Acknowledged.
| |
80 } | |
70 // FIXME: call provideServiceWorkerContainerClientToWorker here when we | 81 // FIXME: call provideServiceWorkerContainerClientToWorker here when we |
71 // support ServiceWorker in dedicated workers (http://crbug.com/371690) | 82 // support ServiceWorker in dedicated workers (http://crbug.com/371690) |
72 return new DedicatedWorkerMessagingProxy(worker, worker_clients); | 83 return new DedicatedWorkerMessagingProxy(worker, worker_clients); |
73 } | 84 } |
74 NOTREACHED(); | 85 NOTREACHED(); |
75 return 0; | 86 return 0; |
76 } | 87 } |
77 | 88 |
78 } // namespace blink | 89 } // namespace blink |
OLD | NEW |