| Index: Source/core/workers/SharedWorkerGlobalScope.cpp
|
| diff --git a/Source/core/workers/SharedWorkerGlobalScope.cpp b/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| index 5c63fa3c90cae0bcd39850d348b22149693b946a..03d3e02c222d50aca1514d75349891a05c9cf891 100644
|
| --- a/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| +++ b/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| @@ -51,7 +51,7 @@ PassRefPtrWillBeRawPtr<MessageEvent> createConnectEvent(PassRefPtrWillBeRawPtr<M
|
| }
|
|
|
| // static
|
| -PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String& name, SharedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData)
|
| +PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String& name, SharedWorkerThread* thread, PassOwnPtr<WorkerScriptStartupData> startupData)
|
| {
|
| // Note: startupData is finalized on return. After the relevant parts has been
|
| // passed along to the created 'context'.
|
| @@ -77,7 +77,7 @@ const AtomicString& SharedWorkerGlobalScope::interfaceName() const
|
|
|
| SharedWorkerThread* SharedWorkerGlobalScope::thread()
|
| {
|
| - return static_cast<SharedWorkerThread*>(Base::thread());
|
| + return static_cast<SharedWorkerThread*>(Base::script());
|
| }
|
|
|
| void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
|
|
|