| Index: third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h
|
| diff --git a/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h b/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h
|
| index e30c5f1524995e179cef118bac381d81fa0fe3d5..1f628eac600a7c5a5606904cdb4efcbd33603685 100644
|
| --- a/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h
|
| +++ b/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h
|
| @@ -34,19 +34,19 @@
|
| #include "core/CoreExport.h"
|
| #include "core/frame/csp/ContentSecurityPolicy.h"
|
| #include "core/workers/WorkerGlobalScope.h"
|
| -#include "core/workers/WorkerThreadStartupData.h"
|
| +#include "core/workers/WorkerScriptStartupData.h"
|
| #include "platform/heap/Handle.h"
|
|
|
| namespace blink {
|
|
|
| class MessageEvent;
|
| -class SharedWorkerThread;
|
| +class SharedWorkerScript;
|
|
|
| class SharedWorkerGlobalScope final : public WorkerGlobalScope {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| typedef WorkerGlobalScope Base;
|
| - static PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> create(const String& name, SharedWorkerThread*, PassOwnPtr<WorkerThreadStartupData>);
|
| + static PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> create(const String& name, SharedWorkerScript*, PassOwnPtr<WorkerScriptStartupData>);
|
| ~SharedWorkerGlobalScope() override;
|
|
|
| bool isSharedWorkerGlobalScope() const override { return true; }
|
| @@ -58,12 +58,12 @@ public:
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(connect);
|
| String name() const { return m_name; }
|
|
|
| - SharedWorkerThread* thread();
|
| + SharedWorkerScript* workerScript();
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - SharedWorkerGlobalScope(const String& name, const KURL&, const String& userAgent, SharedWorkerThread*, PassOwnPtr<SecurityOrigin::PrivilegeData>, PassOwnPtrWillBeRawPtr<WorkerClients>);
|
| + SharedWorkerGlobalScope(const String& name, const KURL&, const String& userAgent, SharedWorkerScript*, PassOwnPtr<SecurityOrigin::PrivilegeData>, PassOwnPtrWillBeRawPtr<WorkerClients>);
|
| void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) override;
|
|
|
| String m_name;
|
|
|