Index: Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp |
diff --git a/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp b/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp |
index 4c4106d9dbad17ffe0e861e296f6b028cf94a42c..405a741ccee1296eaa80690b12b7cda457dcb034 100644 |
--- a/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp |
+++ b/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp |
@@ -41,7 +41,7 @@ |
#include "core/inspector/WorkerInspectorController.h" |
#include "core/loader/ThreadableLoader.h" |
#include "core/workers/WorkerClients.h" |
-#include "core/workers/WorkerThreadStartupData.h" |
+#include "core/workers/WorkerScriptStartupData.h" |
#include "modules/EventTargetModules.h" |
#include "modules/cachestorage/CacheStorage.h" |
#include "modules/cachestorage/InspectorCacheStorageAgent.h" |
@@ -78,7 +78,7 @@ private: |
RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver; |
}; |
-PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> ServiceWorkerGlobalScope::create(ServiceWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData) |
+PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> ServiceWorkerGlobalScope::create(ServiceWorkerThread* thread, PassOwnPtr<WorkerScriptStartupData> startupData) |
{ |
// Note: startupData is finalized on return. After the relevant parts has been |
// passed along to the created 'context'. |
@@ -197,7 +197,7 @@ void ServiceWorkerGlobalScope::dispatchExtendableEvent(PassRefPtrWillBeRawPtr<Ev |
observer->willDispatchEvent(); |
dispatchEvent(event); |
- if (thread()->terminated()) |
+ if (script()->terminated()) |
m_hadErrorInTopLevelEventHandler = true; |
observer->didDispatchEvent(m_hadErrorInTopLevelEventHandler); |
} |