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" |
| 38 #include "platform/loader/fetch/ResourceFetcher.h" |
| 39 #include "public/platform/Platform.h" |
37 #include "public/platform/WebContentSettingsClient.h" | 40 #include "public/platform/WebContentSettingsClient.h" |
38 #include "public/platform/WebString.h" | 41 #include "public/platform/WebString.h" |
39 #include "public/web/WebFrameClient.h" | 42 #include "public/web/WebFrameClient.h" |
40 #include "public/web/WebWorkerContentSettingsClientProxy.h" | 43 #include "public/web/WebWorkerContentSettingsClientProxy.h" |
41 #include "web/IndexedDBClientImpl.h" | 44 #include "web/IndexedDBClientImpl.h" |
42 #include "web/LocalFileSystemClient.h" | 45 #include "web/LocalFileSystemClient.h" |
43 #include "web/WebLocalFrameImpl.h" | 46 #include "web/WebLocalFrameImpl.h" |
44 #include "web/WebViewImpl.h" | 47 #include "web/WebViewImpl.h" |
45 #include "web/WorkerContentSettingsClient.h" | 48 #include "web/WorkerContentSettingsClient.h" |
46 #include "wtf/PtrUtil.h" | 49 #include "wtf/PtrUtil.h" |
(...skipping 13 matching lines...) Expand all Loading... |
60 WebLocalFrameImpl::fromFrame(document->frame()); | 63 WebLocalFrameImpl::fromFrame(document->frame()); |
61 WorkerClients* workerClients = WorkerClients::create(); | 64 WorkerClients* workerClients = WorkerClients::create(); |
62 provideIndexedDBClientToWorker(workerClients, | 65 provideIndexedDBClientToWorker(workerClients, |
63 IndexedDBClientImpl::create(*workerClients)); | 66 IndexedDBClientImpl::create(*workerClients)); |
64 provideLocalFileSystemToWorker(workerClients, | 67 provideLocalFileSystemToWorker(workerClients, |
65 LocalFileSystemClient::create()); | 68 LocalFileSystemClient::create()); |
66 provideContentSettingsClientToWorker( | 69 provideContentSettingsClientToWorker( |
67 workerClients, | 70 workerClients, |
68 WTF::wrapUnique( | 71 WTF::wrapUnique( |
69 webFrame->client()->createWorkerContentSettingsClientProxy())); | 72 webFrame->client()->createWorkerContentSettingsClientProxy())); |
| 73 std::unique_ptr<WebWorkerFetchContextInfo> webWorkerFetchContextInfo = |
| 74 Platform::current()->createWorkerFetchContextInfo(); |
| 75 // |webWorkerFetchContextInfo| is null if off-main-thread-fetch is disabled. |
| 76 if (webWorkerFetchContextInfo) { |
| 77 webWorkerFetchContextInfo->setAppCacheHostID( |
| 78 document->fetcher()->context().applicationCacheHostID()); |
| 79 webFrame->client()->propagateAuxiliaryFetchContext( |
| 80 webWorkerFetchContextInfo.get()); |
| 81 provideWorkerFetchContextInfoToWorker( |
| 82 workerClients, std::move(webWorkerFetchContextInfo)); |
| 83 WorkerFetchContextInfo* workerFetchContextInfo = |
| 84 WorkerFetchContextInfo::from(*workerClients); |
| 85 workerFetchContextInfo->setDataSaverEnabled( |
| 86 document->frame()->settings()->getDataSaverEnabled()); |
| 87 workerFetchContextInfo->setStrictMixedContentCheckingEnabled( |
| 88 document->frame()->settings()->getStrictMixedContentChecking()); |
| 89 } |
70 // FIXME: call provideServiceWorkerContainerClientToWorker here when we | 90 // FIXME: call provideServiceWorkerContainerClientToWorker here when we |
71 // support ServiceWorker in dedicated workers (http://crbug.com/371690) | 91 // support ServiceWorker in dedicated workers (http://crbug.com/371690) |
72 return new DedicatedWorkerMessagingProxy(worker, workerClients); | 92 return new DedicatedWorkerMessagingProxy(worker, workerClients); |
73 } | 93 } |
74 NOTREACHED(); | 94 NOTREACHED(); |
75 return 0; | 95 return 0; |
76 } | 96 } |
77 | 97 |
78 } // namespace blink | 98 } // namespace blink |
OLD | NEW |