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 29 matching lines...) Loading... |
40 #include "public/web/WebWorkerContentSettingsClientProxy.h" | 40 #include "public/web/WebWorkerContentSettingsClientProxy.h" |
41 #include "web/LocalFileSystemClient.h" | 41 #include "web/LocalFileSystemClient.h" |
42 #include "web/WebLocalFrameImpl.h" | 42 #include "web/WebLocalFrameImpl.h" |
43 #include "web/WebViewImpl.h" | 43 #include "web/WebViewImpl.h" |
44 #include "web/WorkerContentSettingsClient.h" | 44 #include "web/WorkerContentSettingsClient.h" |
45 | 45 |
46 namespace blink { | 46 namespace blink { |
47 | 47 |
48 WorkerGlobalScopeProxy* WorkerGlobalScopeProxyProviderImpl::createWorkerGlobalSc
opeProxy(Worker* worker) | 48 WorkerGlobalScopeProxy* WorkerGlobalScopeProxyProviderImpl::createWorkerGlobalSc
opeProxy(Worker* worker) |
49 { | 49 { |
50 if (worker->executionContext()->isDocument()) { | 50 if (worker->getExecutionContext()->isDocument()) { |
51 Document* document = toDocument(worker->executionContext()); | 51 Document* document = toDocument(worker->getExecutionContext()); |
52 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->fra
me()); | 52 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->fra
me()); |
53 OwnPtrWillBeRawPtr<WorkerClients> workerClients = WorkerClients::create(
); | 53 OwnPtrWillBeRawPtr<WorkerClients> workerClients = WorkerClients::create(
); |
54 provideLocalFileSystemToWorker(workerClients.get(), LocalFileSystemClien
t::create()); | 54 provideLocalFileSystemToWorker(workerClients.get(), LocalFileSystemClien
t::create()); |
55 provideContentSettingsClientToWorker(workerClients.get(), adoptPtr(webFr
ame->client()->createWorkerContentSettingsClientProxy())); | 55 provideContentSettingsClientToWorker(workerClients.get(), adoptPtr(webFr
ame->client()->createWorkerContentSettingsClientProxy())); |
56 // FIXME: call provideServiceWorkerContainerClientToWorker here when we | 56 // FIXME: call provideServiceWorkerContainerClientToWorker here when we |
57 // support ServiceWorker in dedicated workers (http://crbug.com/371690) | 57 // support ServiceWorker in dedicated workers (http://crbug.com/371690) |
58 return new DedicatedWorkerMessagingProxy(worker, workerClients.release()
); | 58 return new DedicatedWorkerMessagingProxy(worker, workerClients.release()
); |
59 } | 59 } |
60 ASSERT_NOT_REACHED(); | 60 ASSERT_NOT_REACHED(); |
61 return 0; | 61 return 0; |
62 } | 62 } |
63 | 63 |
64 } // namespace blink | 64 } // namespace blink |
OLD | NEW |