| Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| index ddb90f1ce27bad4efbf4a1e360210dc73f42fad2..144f0b649f54ede118ad8d47fb2d97f6b80cdeed 100644
|
| --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| @@ -186,8 +186,12 @@ void ServiceWorkerGlobalScope::dispatchExtendableEvent(Event* event, WaitUntilOb
|
|
|
| observer->willDispatchEvent();
|
| dispatchEvent(event);
|
| - if (thread()->terminated())
|
| +
|
| + // Check if the worker thread is forcibly terminated during the event
|
| + // because of timeout etc.
|
| + if (thread()->isForciblyTerminated())
|
| m_hadErrorInTopLevelEventHandler = true;
|
| +
|
| observer->didDispatchEvent(m_hadErrorInTopLevelEventHandler);
|
| }
|
|
|
|
|