| Index: Source/modules/serviceworkers/ServiceWorkerContainer.cpp
|
| diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
|
| index 4f267bb9f662050552d3e7724c5fdfe9d89295a0..5efb36823fd3c2bc2a61d940fc249cd180e27f00 100644
|
| --- a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
|
| +++ b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
|
| @@ -156,11 +156,6 @@ ScriptPromise ServiceWorkerContainer::ready(ScriptState* scriptState)
|
| return ScriptPromise();
|
| }
|
|
|
| -void ServiceWorkerContainer::setCurrentServiceWorker(blink::WebServiceWorker* serviceWorker)
|
| -{
|
| - setController(serviceWorker);
|
| -}
|
| -
|
| // If the WebServiceWorker is up for adoption (does not have a
|
| // WebServiceWorkerProxy owner), rejects the adoption by deleting the
|
| // WebServiceWorker.
|
| @@ -170,13 +165,13 @@ static void deleteIfNoExistingOwner(blink::WebServiceWorker* serviceWorker)
|
| delete serviceWorker;
|
| }
|
|
|
| -void ServiceWorkerContainer::setWaiting(blink::WebServiceWorker* serviceWorker)
|
| +void ServiceWorkerContainer::setActive(blink::WebServiceWorker* serviceWorker)
|
| {
|
| if (!executionContext()) {
|
| deleteIfNoExistingOwner(serviceWorker);
|
| return;
|
| }
|
| - m_waiting = ServiceWorker::from(executionContext(), serviceWorker);
|
| + m_active = ServiceWorker::from(executionContext(), serviceWorker);
|
| }
|
|
|
| void ServiceWorkerContainer::setController(blink::WebServiceWorker* serviceWorker)
|
| @@ -188,6 +183,24 @@ void ServiceWorkerContainer::setController(blink::WebServiceWorker* serviceWorke
|
| m_controller = ServiceWorker::from(executionContext(), serviceWorker);
|
| }
|
|
|
| +void ServiceWorkerContainer::setInstalling(blink::WebServiceWorker* serviceWorker)
|
| +{
|
| + if (!executionContext()) {
|
| + deleteIfNoExistingOwner(serviceWorker);
|
| + return;
|
| + }
|
| + m_installing = ServiceWorker::from(executionContext(), serviceWorker);
|
| +}
|
| +
|
| +void ServiceWorkerContainer::setWaiting(blink::WebServiceWorker* serviceWorker)
|
| +{
|
| + if (!executionContext()) {
|
| + deleteIfNoExistingOwner(serviceWorker);
|
| + return;
|
| + }
|
| + m_waiting = ServiceWorker::from(executionContext(), serviceWorker);
|
| +}
|
| +
|
| void ServiceWorkerContainer::dispatchMessageEvent(const blink::WebString& message, const blink::WebMessagePortChannelArray& webChannels)
|
| {
|
| if (!executionContext() || !executionContext()->executingWindow())
|
|
|