(WIP) Worker: Merge ParentFrameTaskRunners into TaskRunnerHelper

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "web/WebEmbeddedWorkerImpl.h"
 
+#include <memory>
 #include "bindings/core/v8/SourceLocation.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/SecurityContext.h"
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/FrameLoadRequest.h"
-#include "core/workers/ParentFrameTaskRunners.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerInspectorProxy.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "modules/serviceworkers/ServiceWorkerThread.h"
 #include "platform/Histogram.h"
 #include "platform/SharedBuffer.h"
@@ skipping 14 matching lines @@
 #include "public/web/modules/serviceworker/WebServiceWorkerContextClient.h"
 #include "public/web/modules/serviceworker/WebServiceWorkerNetworkProvider.h"
 #include "web/IndexedDBClientImpl.h"
 #include "web/ServiceWorkerGlobalScopeClientImpl.h"
 #include "web/ServiceWorkerGlobalScopeProxy.h"
 #include "web/WebDataSourceImpl.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WorkerContentSettingsClient.h"
 #include "wtf/Functional.h"
 #include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 WebEmbeddedWorker* WebEmbeddedWorker::create(
     WebServiceWorkerContextClient* client,
     WebWorkerContentSettingsClientProxy* contentSettingsClient) {
   return new WebEmbeddedWorkerImpl(WTF::wrapUnique(client),
                                    WTF::wrapUnique(contentSettingsClient));
 }
 
@@ skipping 169 matching lines @@
                              message.columnNumber, nullptr)));
 }
 
 void WebEmbeddedWorkerImpl::postMessageToPageInspector(const String& message) {
   m_workerInspectorProxy->dispatchMessageFromWorker(message);
 }
 
 void WebEmbeddedWorkerImpl::postTaskToLoader(
     const WebTraceLocation& location,
     std::unique_ptr<WTF::CrossThreadClosure> task) {
-  m_mainThreadTaskRunners->get(TaskType::Networking)
+  FrameTaskRunnerHelper::get(TaskType::Networking, m_workerThread.get())
       ->postTask(BLINK_FROM_HERE, std::move(task));
 }
 
 void WebEmbeddedWorkerImpl::postTaskToWorkerGlobalScope(
     const WebTraceLocation& location,
     std::unique_ptr<WTF::CrossThreadClosure> task) {
   if (m_askedToTerminate || !m_workerThread)
     return;
   m_workerThread->postTask(location, std::move(task));
 }
@@ skipping 180 matching lines @@
           scriptURL, m_workerStartData.userAgent, m_mainScriptLoader->script(),
           m_mainScriptLoader->releaseCachedMetadata(), startMode,
           document->contentSecurityPolicy()->headers().get(),
           m_mainScriptLoader->getReferrerPolicy(), starterOrigin, workerClients,
           m_mainScriptLoader->responseAddressSpace(),
           m_mainScriptLoader->originTrialTokens(), std::move(workerSettings),
           workerV8Settings);
 
   m_mainScriptLoader.clear();
 
-  // We have a dummy document here for loading but it doesn't really represent
-  // the document/frame of associated document(s) for this worker. Here we
-  // populate the task runners with null document not to confuse the frame
-  // scheduler (which will end up using the thread's default task runner).
-  m_mainThreadTaskRunners = ParentFrameTaskRunners::create(nullptr);
-
   m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(
       *this, *document, *m_workerContextClient);
   m_loaderProxy = WorkerLoaderProxy::create(this);
   m_workerThread =
       ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy);
-  m_workerThread->start(std::move(startupData), m_mainThreadTaskRunners.get());
+  // We have a dummy document here for loading but it doesn't really represent
+  // the document/frame of associated document(s) for this worker. Here we
+  // populate the task runners with null document not to confuse the frame
+  // scheduler (which will end up using the thread's default task runner).
+  m_workerThread->start(std::move(startupData),
+                        FrameTaskRunnersHolder::create(nullptr));
   m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
                                               scriptURL);
 }
 
 }  // namespace blink