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 3f31441b1dc7b75a8442a0e1abfaf43b5bc73638..7b2b1017d145d0d0abe7b02df07b52a8bcee1f87 100644 |
--- a/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp |
+++ b/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp |
@@ -96,12 +96,8 @@ void DedicatedWorkerGlobalScope::postMessage( |
MessagePort::disentanglePorts(context, ports, exceptionState); |
if (exceptionState.hadException()) |
return; |
- thread()->workerObjectProxy().postMessageToWorkerObject(std::move(message), |
- std::move(channels)); |
-} |
- |
-DedicatedWorkerThread* DedicatedWorkerGlobalScope::thread() const { |
- return static_cast<DedicatedWorkerThread*>(WorkerGlobalScope::thread()); |
+ workerObjectProxy().postMessageToWorkerObject(std::move(message), |
+ std::move(channels)); |
} |
static void countOnDocument(UseCounter::Feature feature, |
@@ -118,16 +114,21 @@ static void countDeprecationOnDocument(UseCounter::Feature feature, |
void DedicatedWorkerGlobalScope::countFeature( |
UseCounter::Feature feature) const { |
- thread()->workerObjectProxy().postTaskToMainExecutionContext( |
+ workerObjectProxy().postTaskToMainExecutionContext( |
createCrossThreadTask(&countOnDocument, feature)); |
} |
void DedicatedWorkerGlobalScope::countDeprecation( |
UseCounter::Feature feature) const { |
- thread()->workerObjectProxy().postTaskToMainExecutionContext( |
+ workerObjectProxy().postTaskToMainExecutionContext( |
createCrossThreadTask(&countDeprecationOnDocument, feature)); |
} |
+InProcessWorkerObjectProxy& DedicatedWorkerGlobalScope::workerObjectProxy() |
+ const { |
+ return static_cast<DedicatedWorkerThread*>(thread())->workerObjectProxy(); |
+} |
+ |
DEFINE_TRACE(DedicatedWorkerGlobalScope) { |
WorkerGlobalScope::trace(visitor); |
} |