| Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h
|
| diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h
|
| index 8cc9f035b5c828b5c91b33647c7786b88f71fcee..196dc1cfe6b96797717e45cfa6a466ad79097a6e 100644
|
| --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h
|
| +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.h
|
| @@ -47,16 +47,16 @@ class ScriptPromise;
|
| class ScriptState;
|
| class ServiceWorkerClients;
|
| class ServiceWorkerRegistration;
|
| -class ServiceWorkerThread;
|
| +class ServiceWorkerScript;
|
| class WaitUntilObserver;
|
| -class WorkerThreadStartupData;
|
| +class WorkerScriptStartupData;
|
|
|
| typedef RequestOrUSVString RequestInfo;
|
|
|
| class MODULES_EXPORT ServiceWorkerGlobalScope final : public WorkerGlobalScope {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| - static PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> create(ServiceWorkerThread*, PassOwnPtr<WorkerThreadStartupData>);
|
| + static PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> create(ServiceWorkerScript*, PassOwnPtr<WorkerScriptStartupData>);
|
|
|
| ~ServiceWorkerGlobalScope() override;
|
| bool isServiceWorkerGlobalScope() const override { return true; }
|
| @@ -95,7 +95,7 @@ protected:
|
| bool addEventListenerInternal(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener>, const EventListenerOptions&) override;
|
|
|
| private:
|
| - ServiceWorkerGlobalScope(const KURL&, const String& userAgent, ServiceWorkerThread*, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData>, PassOwnPtrWillBeRawPtr<WorkerClients>);
|
| + ServiceWorkerGlobalScope(const KURL&, const String& userAgent, ServiceWorkerScript*, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData>, PassOwnPtrWillBeRawPtr<WorkerClients>);
|
| void importScripts(const Vector<String>& urls, ExceptionState&) override;
|
| PassOwnPtrWillBeRawPtr<CachedMetadataHandler> createWorkerScriptCachedMetadataHandler(const KURL& scriptURL, const Vector<char>* metaData) override;
|
| void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) override;
|
|
|