Chromium Code Reviews| Index: third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
| diff --git a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
| index 7f6f81b1b9e1f8e90603e49de0dae8c32a3632d1..b3d1850adf7115988cb12ace8c85a4223eb20caa 100644 |
| --- a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
| +++ b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
| @@ -38,7 +38,6 @@ |
| #include "core/dom/MessagePort.h" |
| #include "core/inspector/ConsoleMessage.h" |
| #include "core/origin_trials/OriginTrials.h" |
| -#include "core/workers/ParentFrameTaskRunners.h" |
| #include "core/workers/WorkerGlobalScope.h" |
| #include "core/workers/WorkerThread.h" |
| #include "modules/background_sync/SyncEvent.h" |
| @@ -87,7 +86,6 @@ ServiceWorkerGlobalScopeProxy::~ServiceWorkerGlobalScopeProxy() { |
| DEFINE_TRACE(ServiceWorkerGlobalScopeProxy) { |
| visitor->trace(m_document); |
| - visitor->trace(m_parentFrameTaskRunners); |
| visitor->trace(m_pendingPreloadFetchEvents); |
| } |
| @@ -359,11 +357,6 @@ void ServiceWorkerGlobalScopeProxy::postMessageToPageInspector( |
| crossThreadUnretained(m_embeddedWorker), message)); |
| } |
| -ParentFrameTaskRunners* |
| -ServiceWorkerGlobalScopeProxy::getParentFrameTaskRunners() { |
| - return m_parentFrameTaskRunners.get(); |
| -} |
| - |
| void ServiceWorkerGlobalScopeProxy::didCreateWorkerGlobalScope( |
| WorkerOrWorkletGlobalScope* workerGlobalScope) { |
| DCHECK(!m_workerGlobalScope); |
| @@ -423,15 +416,7 @@ ServiceWorkerGlobalScopeProxy::ServiceWorkerGlobalScopeProxy( |
| : m_embeddedWorker(&embeddedWorker), |
| m_document(&document), |
| m_client(&client), |
| - m_workerGlobalScope(nullptr) { |
| - // ServiceWorker can sometimes run tasks that are initiated by/associated with |
| - // a document's frame but these documents can be from a different process. So |
| - // we intentionally populate the task runners with null document in order to |
| - // use the thread's default task runner. Note that |m_document| should not be |
| - // used as it's a dummy document for loading that doesn't represent the frame |
| - // of any associated document. |
| - m_parentFrameTaskRunners = ParentFrameTaskRunners::create(nullptr); |
|
nhiroki
2016/11/29 07:08:27
Just note: We might need to take back this removal
|
| -} |
| + m_workerGlobalScope(nullptr) {} |
| void ServiceWorkerGlobalScopeProxy::detach() { |
| m_embeddedWorker = nullptr; |