OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 15 matching lines...) Expand all Loading... | |
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 #include "config.h" | 30 #include "config.h" |
31 #include "ServiceWorkerGlobalScope.h" | 31 #include "ServiceWorkerGlobalScope.h" |
32 | 32 |
33 #include "core/workers/WorkerClients.h" | 33 #include "core/workers/WorkerClients.h" |
34 #include "core/workers/WorkerThreadStartupData.h" | 34 #include "core/workers/WorkerThreadStartupData.h" |
35 #include "modules/EventTargetModules.h" | 35 #include "modules/EventTargetModules.h" |
36 #include "modules/serviceworkers/FetchManager.h" | |
37 #include "modules/serviceworkers/Request.h" | |
36 #include "modules/serviceworkers/ServiceWorkerClients.h" | 38 #include "modules/serviceworkers/ServiceWorkerClients.h" |
37 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" | 39 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" |
38 #include "modules/serviceworkers/ServiceWorkerThread.h" | 40 #include "modules/serviceworkers/ServiceWorkerThread.h" |
39 #include "platform/weborigin/KURL.h" | 41 #include "platform/weborigin/KURL.h" |
40 #include "public/platform/WebURL.h" | 42 #include "public/platform/WebURL.h" |
41 #include "wtf/CurrentTime.h" | 43 #include "wtf/CurrentTime.h" |
42 | 44 |
43 namespace WebCore { | 45 namespace WebCore { |
44 | 46 |
45 PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> ServiceWorkerGlobalScope::creat e(ServiceWorkerThread* thread, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> s tartupData) | 47 PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> ServiceWorkerGlobalScope::creat e(ServiceWorkerThread* thread, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> s tartupData) |
46 { | 48 { |
47 RefPtrWillBeRawPtr<ServiceWorkerGlobalScope> context = adoptRefWillBeRefCoun tedGarbageCollected(new ServiceWorkerGlobalScope(startupData->m_scriptURL, start upData->m_userAgent, thread, monotonicallyIncreasingTime(), startupData->m_worke rClients.release())); | 49 RefPtrWillBeRawPtr<ServiceWorkerGlobalScope> context = adoptRefWillBeRefCoun tedGarbageCollected(new ServiceWorkerGlobalScope(startupData->m_scriptURL, start upData->m_userAgent, thread, monotonicallyIncreasingTime(), startupData->m_worke rClients.release())); |
48 | 50 |
49 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity Policy, startupData->m_contentSecurityPolicyType); | 51 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity Policy, startupData->m_contentSecurityPolicyType); |
50 return context.release(); | 52 return context.release(); |
51 } | 53 } |
52 | 54 |
53 ServiceWorkerGlobalScope::ServiceWorkerGlobalScope(const KURL& url, const String & userAgent, ServiceWorkerThread* thread, double timeOrigin, PassOwnPtrWillBeRaw Ptr<WorkerClients> workerClients) | 55 ServiceWorkerGlobalScope::ServiceWorkerGlobalScope(const KURL& url, const String & userAgent, ServiceWorkerThread* thread, double timeOrigin, PassOwnPtrWillBeRaw Ptr<WorkerClients> workerClients) |
54 : WorkerGlobalScope(url, userAgent, thread, timeOrigin, workerClients) | 56 : WorkerGlobalScope(url, userAgent, thread, timeOrigin, workerClients) |
57 , m_fetchManager(adoptPtr(new FetchManager(this))) | |
55 { | 58 { |
56 ScriptWrappable::init(this); | 59 ScriptWrappable::init(this); |
57 } | 60 } |
58 | 61 |
59 ServiceWorkerGlobalScope::~ServiceWorkerGlobalScope() | 62 ServiceWorkerGlobalScope::~ServiceWorkerGlobalScope() |
60 { | 63 { |
61 } | 64 } |
62 | 65 |
66 void ServiceWorkerGlobalScope::stopFetch() | |
67 { | |
68 m_fetchManager = 0; | |
69 } | |
70 | |
63 String ServiceWorkerGlobalScope::scope(ExecutionContext* context) | 71 String ServiceWorkerGlobalScope::scope(ExecutionContext* context) |
64 { | 72 { |
65 return ServiceWorkerGlobalScopeClient::from(context)->scope().string(); | 73 return ServiceWorkerGlobalScopeClient::from(context)->scope().string(); |
66 } | 74 } |
67 | 75 |
76 ScriptPromise ServiceWorkerGlobalScope::fetch(ScriptState* scriptState, Request* request) | |
77 { | |
78 OwnPtr<ResourceRequest> resourceRequest(request->createResourceRequest()); | |
79 return m_fetchManager->fetch(scriptState, resourceRequest.release()); | |
80 } | |
81 | |
82 ScriptPromise ServiceWorkerGlobalScope::fetch(ScriptState* scriptState, const St ring& urlstring) | |
83 { | |
84 KURL url = completeURL(urlstring); | |
tyoshino (SeeGerritForStatus)
2014/06/10 05:18:38
if (!url.isValid())
throw TypeError
horo
2014/06/10 06:44:59
Done.
| |
85 OwnPtr<ResourceRequest> resourceRequest = adoptPtr(new ResourceRequest(url)) ; | |
86 resourceRequest->setHTTPMethod("GET"); | |
87 return m_fetchManager->fetch(scriptState, resourceRequest.release()); | |
88 } | |
89 | |
68 PassRefPtr<ServiceWorkerClients> ServiceWorkerGlobalScope::clients() | 90 PassRefPtr<ServiceWorkerClients> ServiceWorkerGlobalScope::clients() |
69 { | 91 { |
70 if (!m_clients) | 92 if (!m_clients) |
71 m_clients = ServiceWorkerClients::create(); | 93 m_clients = ServiceWorkerClients::create(); |
72 return m_clients; | 94 return m_clients; |
73 } | 95 } |
74 | 96 |
75 const AtomicString& ServiceWorkerGlobalScope::interfaceName() const | 97 const AtomicString& ServiceWorkerGlobalScope::interfaceName() const |
76 { | 98 { |
77 return EventTargetNames::ServiceWorkerGlobalScope; | 99 return EventTargetNames::ServiceWorkerGlobalScope; |
78 } | 100 } |
79 | 101 |
80 void ServiceWorkerGlobalScope::trace(Visitor* visitor) | 102 void ServiceWorkerGlobalScope::trace(Visitor* visitor) |
81 { | 103 { |
82 WorkerGlobalScope::trace(visitor); | 104 WorkerGlobalScope::trace(visitor); |
83 } | 105 } |
84 | 106 |
85 } // namespace WebCore | 107 } // namespace WebCore |
OLD | NEW |