(WIP) Worker: Merge ParentFrameTaskRunners into TaskRunnerHelper

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.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/ServiceWorkerGlobalScopeProxy.h"
 
+#include <memory>
+#include <utility>
 #include "bindings/core/v8/SourceLocation.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/MessagePort.h"
+#include "core/dom/TaskRunnerHelper.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"
 #include "modules/fetch/Headers.h"
 #include "modules/notifications/Notification.h"
 #include "modules/notifications/NotificationEvent.h"
 #include "modules/notifications/NotificationEventInit.h"
 #include "modules/payments/PaymentAppRequest.h"
 #include "modules/payments/PaymentAppRequestConversion.h"
 #include "modules/payments/PaymentRequestEvent.h"
@@ skipping 11 matching lines @@
 #include "platform/RuntimeEnabledFeatures.h"
 #include "public/platform/modules/notifications/WebNotificationData.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerEventResult.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerRequest.h"
 #include "public/web/WebSerializedScriptValue.h"
 #include "public/web/modules/serviceworker/WebServiceWorkerContextClient.h"
 #include "web/WebEmbeddedWorkerImpl.h"
 #include "wtf/Assertions.h"
 #include "wtf/Functional.h"
 #include "wtf/PtrUtil.h"
-#include <memory>
-#include <utility>
 
 namespace blink {
 
 ServiceWorkerGlobalScopeProxy* ServiceWorkerGlobalScopeProxy::create(
     WebEmbeddedWorkerImpl& embeddedWorker,
     Document& document,
     WebServiceWorkerContextClient& client) {
   return new ServiceWorkerGlobalScopeProxy(embeddedWorker, document, client);
 }
 
 ServiceWorkerGlobalScopeProxy::~ServiceWorkerGlobalScopeProxy() {
   // Verify that the proxy has been detached.
   DCHECK(!m_embeddedWorker);
 }
 
 DEFINE_TRACE(ServiceWorkerGlobalScopeProxy) {
   visitor->trace(m_document);
-  visitor->trace(m_parentFrameTaskRunners);
   visitor->trace(m_pendingPreloadFetchEvents);
 }
 
 void ServiceWorkerGlobalScopeProxy::setRegistration(
     std::unique_ptr<WebServiceWorkerRegistration::Handle> handle) {
   workerGlobalScope()->setRegistration(std::move(handle));
 }
 
 void ServiceWorkerGlobalScopeProxy::dispatchActivateEvent(int eventID) {
   WaitUntilObserver* observer = WaitUntilObserver::create(
@@ skipping 280 matching lines @@
     SourceLocation* location) {
   client().reportConsoleMessage(source, level, message, location->lineNumber(),
                                 location->url());
 }
 
 void ServiceWorkerGlobalScopeProxy::postMessageToPageInspector(
     const String& message) {
   DCHECK(m_embeddedWorker);
   // The TaskType of Inspector tasks need to be Unthrottled because they need to
   // run even on a suspended page.
-  m_parentFrameTaskRunners->get(TaskType::Unthrottled)
+  FrameTaskRunnerHelper::get(TaskType::Unthrottled, m_workerGlobalScope.get())
       ->postTask(
           BLINK_FROM_HERE,
           crossThreadBind(&WebEmbeddedWorkerImpl::postMessageToPageInspector,
                           crossThreadUnretained(m_embeddedWorker), message));
 }
 
 void ServiceWorkerGlobalScopeProxy::didCreateWorkerGlobalScope(
     WorkerOrWorkletGlobalScope* workerGlobalScope) {
   DCHECK(!m_workerGlobalScope);
   m_workerGlobalScope =
@@ skipping 46 matching lines @@
 }
 
 ServiceWorkerGlobalScopeProxy::ServiceWorkerGlobalScopeProxy(
     WebEmbeddedWorkerImpl& embeddedWorker,
     Document& document,
     WebServiceWorkerContextClient& client)
     : 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);
 }
 
 void ServiceWorkerGlobalScopeProxy::detach() {
   m_embeddedWorker = nullptr;
   m_document = nullptr;
   m_client = nullptr;
   m_workerGlobalScope = nullptr;
 }
 
 WebServiceWorkerContextClient& ServiceWorkerGlobalScopeProxy::client() const {
   DCHECK(m_client);
   return *m_client;
 }
 
 Document& ServiceWorkerGlobalScopeProxy::document() const {
   DCHECK(m_document);
   return *m_document;
 }
 
 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope()
     const {
   DCHECK(m_workerGlobalScope);
   return m_workerGlobalScope;
 }
 
 }  // namespace blink