| Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
| index 47e1ed2dff6304748a02fadadb66196a4f644d33..6b25a1db25583062bc4a1ef1de6bc7f66153d2d8 100644
|
| --- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
| @@ -31,7 +31,6 @@
|
| #include "web/WebSharedWorkerImpl.h"
|
|
|
| #include "core/dom/Document.h"
|
| -#include "core/dom/ExecutionContextTask.h"
|
| #include "core/events/MessageEvent.h"
|
| #include "core/html/HTMLFormElement.h"
|
| #include "core/inspector/ConsoleMessage.h"
|
| @@ -303,13 +302,9 @@ void WebSharedWorkerImpl::didTerminateWorkerThreadOnMainThread() {
|
|
|
| void WebSharedWorkerImpl::postTaskToLoader(
|
| const WebTraceLocation& location,
|
| - std::unique_ptr<ExecutionContextTask> task) {
|
| + std::unique_ptr<WTF::CrossThreadClosure> task) {
|
| m_parentFrameTaskRunners->get(TaskType::Networking)
|
| - ->postTask(FROM_HERE,
|
| - crossThreadBind(
|
| - &ExecutionContextTask::performTaskIfContextIsValid,
|
| - WTF::passed(std::move(task)),
|
| - wrapCrossThreadWeakPersistent(m_loadingDocument.get())));
|
| + ->postTask(FROM_HERE, std::move(task));
|
| }
|
|
|
| void WebSharedWorkerImpl::postTaskToWorkerGlobalScope(
|
| @@ -318,6 +313,10 @@ void WebSharedWorkerImpl::postTaskToWorkerGlobalScope(
|
| m_workerThread->postTask(location, std::move(task));
|
| }
|
|
|
| +ExecutionContext* WebSharedWorkerImpl::getLoaderExecutionContext() {
|
| + return m_loadingDocument.get();
|
| +}
|
| +
|
| void WebSharedWorkerImpl::connect(WebMessagePortChannel* webChannel) {
|
| DCHECK(isMainThread());
|
| workerThread()->postTask(
|
|
|