ServiceWorker: Detect forcible worker thread termination in a correct way

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 168 matching lines @@
     return dispatchResult;
 }
 
 void ServiceWorkerGlobalScope::dispatchExtendableEvent(Event* event, WaitUntilObserver* observer)
 {
     ASSERT(m_eventNestingLevel == 0);
     m_hadErrorInTopLevelEventHandler = false;
 
     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);
 }
 
 DEFINE_TRACE(ServiceWorkerGlobalScope)
 {
     visitor->trace(m_clients);
     visitor->trace(m_registration);
     WorkerGlobalScope::trace(visitor);
 }
 
@@ skipping 20 matching lines @@
 }
 
 void ServiceWorkerGlobalScope::scriptLoaded(size_t scriptSize, size_t cachedMetadataSize)
 {
     ++m_scriptCount;
     m_scriptTotalSize += scriptSize;
     m_scriptCachedMetadataTotalSize += cachedMetadataSize;
 }
 
 } // namespace blink