| Index: Source/core/workers/SharedWorkerGlobalScope.cpp
|
| diff --git a/Source/core/workers/SharedWorkerContext.cpp b/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| similarity index 68%
|
| rename from Source/core/workers/SharedWorkerContext.cpp
|
| rename to Source/core/workers/SharedWorkerGlobalScope.cpp
|
| index d76c77337c55cea2eaafe8e31f8a79a33d1c334f..3f74aa0fefbd4b8a32eded547b5f18b47e442035 100644
|
| --- a/Source/core/workers/SharedWorkerContext.cpp
|
| +++ b/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| @@ -30,7 +30,7 @@
|
|
|
| #include "config.h"
|
|
|
| -#include "core/workers/SharedWorkerContext.h"
|
| +#include "core/workers/SharedWorkerGlobalScope.h"
|
|
|
| #include "core/dom/EventNames.h"
|
| #include "core/dom/MessageEvent.h"
|
| @@ -49,37 +49,37 @@ PassRefPtr<MessageEvent> createConnectEvent(PassRefPtr<MessagePort> port)
|
| }
|
|
|
| // static
|
| -PassRefPtr<SharedWorkerContext> SharedWorkerContext::create(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
|
| +PassRefPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
|
| {
|
| - RefPtr<SharedWorkerContext> context = adoptRef(new SharedWorkerContext(name, url, userAgent, thread));
|
| + RefPtr<SharedWorkerGlobalScope> context = adoptRef(new SharedWorkerGlobalScope(name, url, userAgent, thread));
|
| context->applyContentSecurityPolicyFromString(contentSecurityPolicy, contentSecurityPolicyType);
|
| return context.release();
|
| }
|
|
|
| -SharedWorkerContext::SharedWorkerContext(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread)
|
| - : WorkerContext(url, userAgent, thread, 0, monotonicallyIncreasingTime())
|
| +SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread)
|
| + : WorkerGlobalScope(url, userAgent, thread, 0, monotonicallyIncreasingTime())
|
| , m_name(name)
|
| {
|
| ScriptWrappable::init(this);
|
| }
|
|
|
| -SharedWorkerContext::~SharedWorkerContext()
|
| +SharedWorkerGlobalScope::~SharedWorkerGlobalScope()
|
| {
|
| }
|
|
|
| -const AtomicString& SharedWorkerContext::interfaceName() const
|
| +const AtomicString& SharedWorkerGlobalScope::interfaceName() const
|
| {
|
| - return eventNames().interfaceForSharedWorkerContext;
|
| + return eventNames().interfaceForSharedWorkerGlobalScope;
|
| }
|
|
|
| -SharedWorkerThread* SharedWorkerContext::thread()
|
| +SharedWorkerThread* SharedWorkerGlobalScope::thread()
|
| {
|
| return static_cast<SharedWorkerThread*>(Base::thread());
|
| }
|
|
|
| -void SharedWorkerContext::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack> callStack)
|
| +void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack> callStack)
|
| {
|
| - WorkerContext::logExceptionToConsole(errorMessage, sourceURL, lineNumber, callStack);
|
| + WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber, callStack);
|
| addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, callStack);
|
| }
|
|
|
|
|