| Index: Source/modules/serviceworkers/WaitUntilObserver.cpp
|
| diff --git a/Source/modules/serviceworkers/WaitUntilObserver.cpp b/Source/modules/serviceworkers/WaitUntilObserver.cpp
|
| index 357254d68a6b6036a177f0ad696043366d7b7233..dbdd3a3aa42713e089740d50678594e326862830 100644
|
| --- a/Source/modules/serviceworkers/WaitUntilObserver.cpp
|
| +++ b/Source/modules/serviceworkers/WaitUntilObserver.cpp
|
| @@ -62,7 +62,6 @@ PassRefPtr<WaitUntilObserver> WaitUntilObserver::create(ExecutionContext* contex
|
|
|
| WaitUntilObserver::~WaitUntilObserver()
|
| {
|
| - ASSERT(!m_pendingActivity);
|
| }
|
|
|
| void WaitUntilObserver::willDispatchEvent()
|
| @@ -108,7 +107,7 @@ void WaitUntilObserver::incrementPendingActivity()
|
| void WaitUntilObserver::decrementPendingActivity()
|
| {
|
| ASSERT(m_pendingActivity > 0);
|
| - if (--m_pendingActivity || !executionContext())
|
| + if (!executionContext() || (!m_hasError && --m_pendingActivity))
|
| return;
|
|
|
| ServiceWorkerGlobalScopeClient* client = ServiceWorkerGlobalScopeClient::from(executionContext());
|
|
|