| Index: third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| diff --git a/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp b/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| index 685579940df6d22c1c15ba372fa4ea6bacb9e820..90b5b2e073917248eb56629a0432a9b4ca005813 100644
|
| --- a/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| +++ b/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| @@ -34,7 +34,7 @@
|
| #include "core/events/MessageEvent.h"
|
| #include "core/inspector/ConsoleMessage.h"
|
| #include "core/frame/LocalDOMWindow.h"
|
| -#include "core/workers/SharedWorkerThread.h"
|
| +#include "core/workers/SharedWorkerScript.h"
|
| #include "core/workers/WorkerClients.h"
|
| #include "wtf/CurrentTime.h"
|
|
|
| @@ -48,17 +48,17 @@ PassRefPtrWillBeRawPtr<MessageEvent> createConnectEvent(MessagePort* port)
|
| }
|
|
|
| // static
|
| -PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String& name, SharedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData)
|
| +PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String& name, SharedWorkerScript* script, PassOwnPtr<WorkerScriptStartupData> startupData)
|
| {
|
| // Note: startupData is finalized on return. After the relevant parts has been
|
| // passed along to the created 'context'.
|
| - RefPtrWillBeRawPtr<SharedWorkerGlobalScope> context = adoptRefWillBeNoop(new SharedWorkerGlobalScope(name, startupData->m_scriptURL, startupData->m_userAgent, thread, startupData->m_starterOriginPrivilegeData.release(), startupData->m_workerClients.release()));
|
| + RefPtrWillBeRawPtr<SharedWorkerGlobalScope> context = adoptRefWillBeNoop(new SharedWorkerGlobalScope(name, startupData->m_scriptURL, startupData->m_userAgent, script, startupData->m_starterOriginPrivilegeData.release(), startupData->m_workerClients.release()));
|
| context->applyContentSecurityPolicyFromVector(*startupData->m_contentSecurityPolicyHeaders);
|
| return context.release();
|
| }
|
|
|
| -SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
|
| - : WorkerGlobalScope(url, userAgent, thread, monotonicallyIncreasingTime(), starterOriginPrivilegeData, workerClients)
|
| +SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL& url, const String& userAgent, SharedWorkerScript* script, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
|
| + : WorkerGlobalScope(url, userAgent, script, monotonicallyIncreasingTime(), starterOriginPrivilegeData, workerClients)
|
| , m_name(name)
|
| {
|
| }
|
| @@ -72,9 +72,9 @@ const AtomicString& SharedWorkerGlobalScope::interfaceName() const
|
| return EventTargetNames::SharedWorkerGlobalScope;
|
| }
|
|
|
| -SharedWorkerThread* SharedWorkerGlobalScope::thread()
|
| +SharedWorkerScript* SharedWorkerGlobalScope::workerScript()
|
| {
|
| - return static_cast<SharedWorkerThread*>(Base::thread());
|
| + return static_cast<SharedWorkerScript*>(Base::workerScript());
|
| }
|
|
|
| void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack> callStack)
|
|
|