| Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp
|
| diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp
|
| index b822eb7be0155159721be346462fca5483a3334e..4bd5ba31146dd099dd0394d648b46bae322ae711 100644
|
| --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp
|
| +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp
|
| @@ -15,7 +15,7 @@ namespace blink {
|
| void NavigateClientCallback::onSuccess(
|
| std::unique_ptr<WebServiceWorkerClientInfo> clientInfo) {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
| m_resolver->resolve(ServiceWorkerWindowClient::take(
|
| m_resolver.get(), wrapUnique(clientInfo.release())));
|
| @@ -23,7 +23,7 @@ void NavigateClientCallback::onSuccess(
|
|
|
| void NavigateClientCallback::onError(const WebServiceWorkerError& error) {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
|
|
| if (error.errorType == WebServiceWorkerError::ErrorTypeNavigation) {
|
|
|