Index: third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp |
diff --git a/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp b/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp |
index 88567612d3f9c224d597ce09860fe9de1bbc21ae..1cacc5dc1b3fef3912bbbe9bf54aa6c9e3fb64fa 100644 |
--- a/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp |
+++ b/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp |
@@ -35,14 +35,14 @@ |
#include "core/dom/CrossThreadTask.h" |
#include "core/frame/Deprecation.h" |
#include "core/frame/LocalDOMWindow.h" |
-#include "core/workers/DedicatedWorkerThread.h" |
+#include "core/workers/DedicatedWorkerScript.h" |
#include "core/workers/WorkerClients.h" |
#include "core/workers/WorkerObjectProxy.h" |
-#include "core/workers/WorkerThreadStartupData.h" |
+#include "core/workers/WorkerScriptStartupData.h" |
namespace blink { |
-PassRefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::create(DedicatedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData, double timeOrigin) |
+PassRefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::create(DedicatedWorkerScript* thread, PassOwnPtr<WorkerScriptStartupData> startupData, double timeOrigin) |
{ |
// Note: startupData is finalized on return. After the relevant parts has been |
// passed along to the created 'context'. |
@@ -51,7 +51,7 @@ PassRefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::c |
return context.release(); |
} |
-DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const KURL& url, const String& userAgent, DedicatedWorkerThread* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients) |
+DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const KURL& url, const String& userAgent, DedicatedWorkerScript* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients) |
: WorkerGlobalScope(url, userAgent, thread, timeOrigin, starterOriginPrivilegeData, workerClients) |
{ |
} |
@@ -71,12 +71,12 @@ void DedicatedWorkerGlobalScope::postMessage(ExecutionContext* context, PassRefP |
OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(context, ports, exceptionState); |
if (exceptionState.hadException()) |
return; |
- thread()->workerObjectProxy().postMessageToWorkerObject(message, channels.release()); |
+ workerScript()->workerObjectProxy().postMessageToWorkerObject(message, channels.release()); |
} |
-DedicatedWorkerThread* DedicatedWorkerGlobalScope::thread() const |
+DedicatedWorkerScript* DedicatedWorkerGlobalScope::workerScript() const |
{ |
- return static_cast<DedicatedWorkerThread*>(Base::thread()); |
+ return static_cast<DedicatedWorkerScript*>(Base::workerScript()); |
} |
static void countOnDocument(UseCounter::Feature feature, ExecutionContext* context) |
@@ -93,12 +93,12 @@ static void countDeprecationOnDocument(UseCounter::Feature feature, ExecutionCon |
void DedicatedWorkerGlobalScope::countFeature(UseCounter::Feature feature) const |
{ |
- thread()->workerObjectProxy().postTaskToMainExecutionContext(createCrossThreadTask(&countOnDocument, feature)); |
+ workerScript()->workerObjectProxy().postTaskToMainExecutionContext(createCrossThreadTask(&countOnDocument, feature)); |
} |
void DedicatedWorkerGlobalScope::countDeprecation(UseCounter::Feature feature) const |
{ |
- thread()->workerObjectProxy().postTaskToMainExecutionContext(createCrossThreadTask(&countDeprecationOnDocument, feature)); |
+ workerScript()->workerObjectProxy().postTaskToMainExecutionContext(createCrossThreadTask(&countDeprecationOnDocument, feature)); |
} |
DEFINE_TRACE(DedicatedWorkerGlobalScope) |