Index: Source/core/workers/DedicatedWorkerGlobalScope.cpp |
diff --git a/Source/core/workers/DedicatedWorkerContext.cpp b/Source/core/workers/DedicatedWorkerGlobalScope.cpp |
similarity index 66% |
rename from Source/core/workers/DedicatedWorkerContext.cpp |
rename to Source/core/workers/DedicatedWorkerGlobalScope.cpp |
index 6f16d003914922d180b8052d52a93d342a90ca56..099263933b9a27a2184d3f2a5bd0b24f114e3037 100644 |
--- a/Source/core/workers/DedicatedWorkerContext.cpp |
+++ b/Source/core/workers/DedicatedWorkerGlobalScope.cpp |
@@ -30,7 +30,7 @@ |
#include "config.h" |
-#include "core/workers/DedicatedWorkerContext.h" |
+#include "core/workers/DedicatedWorkerGlobalScope.h" |
#include "core/page/DOMWindow.h" |
#include "core/workers/DedicatedWorkerThread.h" |
@@ -38,29 +38,29 @@ |
namespace WebCore { |
-PassRefPtr<DedicatedWorkerContext> DedicatedWorkerContext::create(const KURL& url, const String& userAgent, DedicatedWorkerThread* thread, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin, double timeOrigin) |
+PassRefPtr<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::create(const KURL& url, const String& userAgent, DedicatedWorkerThread* thread, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin, double timeOrigin) |
{ |
- RefPtr<DedicatedWorkerContext> context = adoptRef(new DedicatedWorkerContext(url, userAgent, thread, topOrigin, timeOrigin)); |
+ RefPtr<DedicatedWorkerGlobalScope> context = adoptRef(new DedicatedWorkerGlobalScope(url, userAgent, thread, topOrigin, timeOrigin)); |
context->applyContentSecurityPolicyFromString(contentSecurityPolicy, contentSecurityPolicyType); |
return context.release(); |
} |
-DedicatedWorkerContext::DedicatedWorkerContext(const KURL& url, const String& userAgent, DedicatedWorkerThread* thread, PassRefPtr<SecurityOrigin> topOrigin, double timeOrigin) |
- : WorkerContext(url, userAgent, thread, topOrigin, timeOrigin) |
+DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const KURL& url, const String& userAgent, DedicatedWorkerThread* thread, PassRefPtr<SecurityOrigin> topOrigin, double timeOrigin) |
+ : WorkerGlobalScope(url, userAgent, thread, topOrigin, timeOrigin) |
{ |
ScriptWrappable::init(this); |
} |
-DedicatedWorkerContext::~DedicatedWorkerContext() |
+DedicatedWorkerGlobalScope::~DedicatedWorkerGlobalScope() |
{ |
} |
-const AtomicString& DedicatedWorkerContext::interfaceName() const |
+const AtomicString& DedicatedWorkerGlobalScope::interfaceName() const |
{ |
- return eventNames().interfaceForDedicatedWorkerContext; |
+ return eventNames().interfaceForDedicatedWorkerGlobalScope; |
} |
-void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionCode& ec) |
+void DedicatedWorkerGlobalScope::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionCode& ec) |
{ |
// Disentangle the port in preparation for sending it to the remote context. |
OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(ports, ec); |
@@ -69,13 +69,13 @@ void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> messa |
thread()->workerObjectProxy().postMessageToWorkerObject(message, channels.release()); |
} |
-void DedicatedWorkerContext::importScripts(const Vector<String>& urls, ExceptionCode& ec) |
+void DedicatedWorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionCode& ec) |
{ |
Base::importScripts(urls, ec); |
thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity()); |
} |
-DedicatedWorkerThread* DedicatedWorkerContext::thread() |
+DedicatedWorkerThread* DedicatedWorkerGlobalScope::thread() |
{ |
return static_cast<DedicatedWorkerThread*>(Base::thread()); |
} |