| 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 20 matching lines...) Expand all Loading... |
| 31 #include "modules/serviceworkers/ServiceWorkerContainer.h" | 31 #include "modules/serviceworkers/ServiceWorkerContainer.h" |
| 32 | 32 |
| 33 #include "RuntimeEnabledFeatures.h" | 33 #include "RuntimeEnabledFeatures.h" |
| 34 #include "bindings/v8/CallbackPromiseAdapter.h" | 34 #include "bindings/v8/CallbackPromiseAdapter.h" |
| 35 #include "bindings/v8/ScriptPromiseResolver.h" | 35 #include "bindings/v8/ScriptPromiseResolver.h" |
| 36 #include "core/dom/ExecutionContext.h" | 36 #include "core/dom/ExecutionContext.h" |
| 37 #include "modules/serviceworkers/RegistrationOptionList.h" | 37 #include "modules/serviceworkers/RegistrationOptionList.h" |
| 38 #include "modules/serviceworkers/ServiceWorker.h" | 38 #include "modules/serviceworkers/ServiceWorker.h" |
| 39 #include "modules/serviceworkers/ServiceWorkerContainerClient.h" | 39 #include "modules/serviceworkers/ServiceWorkerContainerClient.h" |
| 40 #include "modules/serviceworkers/ServiceWorkerError.h" | 40 #include "modules/serviceworkers/ServiceWorkerError.h" |
| 41 #include "public/platform/WebServiceWorker.h" |
| 41 #include "public/platform/WebServiceWorkerProvider.h" | 42 #include "public/platform/WebServiceWorkerProvider.h" |
| 42 #include "public/platform/WebString.h" | 43 #include "public/platform/WebString.h" |
| 43 #include "public/platform/WebURL.h" | 44 #include "public/platform/WebURL.h" |
| 44 | 45 |
| 45 using blink::WebServiceWorkerProvider; | 46 using blink::WebServiceWorkerProvider; |
| 46 | 47 |
| 47 namespace WebCore { | 48 namespace WebCore { |
| 48 | 49 |
| 49 PassRefPtr<ServiceWorkerContainer> ServiceWorkerContainer::create(ExecutionConte
xt* executionContext) | 50 PassRefPtr<ServiceWorkerContainer> ServiceWorkerContainer::create(ExecutionConte
xt* executionContext) |
| 50 { | 51 { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 KURL patternURL = executionContext->completeURL(pattern); | 108 KURL patternURL = executionContext->completeURL(pattern); |
| 108 if (!pattern.isEmpty() && !documentOrigin->canRequest(patternURL)) { | 109 if (!pattern.isEmpty() && !documentOrigin->canRequest(patternURL)) { |
| 109 resolver->reject(DOMError::create(SecurityError, "Can only unregister fo
r patterns in the document's origin.")); | 110 resolver->reject(DOMError::create(SecurityError, "Can only unregister fo
r patterns in the document's origin.")); |
| 110 return promise; | 111 return promise; |
| 111 } | 112 } |
| 112 | 113 |
| 113 m_provider->unregisterServiceWorker(patternURL, new CallbackPromiseAdapter<S
erviceWorker, ServiceWorkerError>(resolver, executionContext)); | 114 m_provider->unregisterServiceWorker(patternURL, new CallbackPromiseAdapter<S
erviceWorker, ServiceWorkerError>(resolver, executionContext)); |
| 114 return promise; | 115 return promise; |
| 115 } | 116 } |
| 116 | 117 |
| 118 void ServiceWorkerContainer::setCurrentServiceWorker(blink::WebServiceWorker* se
rviceWorker) |
| 119 { |
| 120 if (!executionContext()) |
| 121 return; |
| 122 m_current = ServiceWorker::create(executionContext(), adoptPtr(serviceWorker
)); |
| 123 } |
| 124 |
| 117 ServiceWorkerContainer::ServiceWorkerContainer(ExecutionContext* executionContex
t) | 125 ServiceWorkerContainer::ServiceWorkerContainer(ExecutionContext* executionContex
t) |
| 118 : m_provider(0) | 126 : ContextLifecycleObserver(executionContext) |
| 127 , m_provider(0) |
| 119 { | 128 { |
| 120 ScriptWrappable::init(this); | 129 ScriptWrappable::init(this); |
| 121 | 130 |
| 122 if (!executionContext) | 131 if (!executionContext) |
| 123 return; | 132 return; |
| 124 | 133 |
| 125 if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::fro
m(executionContext)) { | 134 if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::fro
m(executionContext)) { |
| 126 m_provider = client->provider(); | 135 m_provider = client->provider(); |
| 127 if (m_provider) | 136 if (m_provider) |
| 128 m_provider->setClient(this); | 137 m_provider->setClient(this); |
| 129 } | 138 } |
| 130 } | 139 } |
| 131 | 140 |
| 132 } // namespace WebCore | 141 } // namespace WebCore |
| OLD | NEW |