Worker: Move ParentFrameTaskRunners from WorkerReportingProxy to ObjectProxy

third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

 /*
  * Copyright (C) 2009 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 235 matching lines @@
 void WebSharedWorkerImpl::reportConsoleMessage(MessageSource,
                                                MessageLevel,
                                                const String& message,
                                                SourceLocation*) {
   // Not supported in SharedWorker.
 }
 
 void WebSharedWorkerImpl::postMessageToPageInspector(const String& message) {
   // The TaskType of Inspector tasks need to be Unthrottled because they need to
   // run even on a suspended page.
-  getParentFrameTaskRunners()
-      ->get(TaskType::Unthrottled)
+  m_parentFrameTaskRunners->get(TaskType::Unthrottled)
       ->postTask(
           BLINK_FROM_HERE,
           crossThreadBind(
               &WebSharedWorkerImpl::postMessageToPageInspectorOnMainThread,
               crossThreadUnretained(this), message));
 }
 
 void WebSharedWorkerImpl::postMessageToPageInspectorOnMainThread(
     const String& message) {
   m_workerInspectorProxy->dispatchMessageFromWorker(message);
 }
 
-ParentFrameTaskRunners* WebSharedWorkerImpl::getParentFrameTaskRunners() {
-  return m_parentFrameTaskRunners.get();
-}
-
 void WebSharedWorkerImpl::didCloseWorkerGlobalScope() {
-  getParentFrameTaskRunners()
-      ->get(TaskType::UnspecedTimer)
+  m_parentFrameTaskRunners->get(TaskType::UnspecedTimer)
       ->postTask(
           BLINK_FROM_HERE,
           crossThreadBind(
               &WebSharedWorkerImpl::didCloseWorkerGlobalScopeOnMainThread,
               crossThreadUnretained(this)));
 }
 
 void WebSharedWorkerImpl::didCloseWorkerGlobalScopeOnMainThread() {
   m_client->workerContextClosed();
 
   terminateWorkerThread();
 }
 
 void WebSharedWorkerImpl::didTerminateWorkerThread() {
-  getParentFrameTaskRunners()
-      ->get(TaskType::UnspecedTimer)
+  m_parentFrameTaskRunners->get(TaskType::UnspecedTimer)
       ->postTask(BLINK_FROM_HERE,
                  crossThreadBind(
                      &WebSharedWorkerImpl::didTerminateWorkerThreadOnMainThread,
                      crossThreadUnretained(this)));
 }
 
 void WebSharedWorkerImpl::didTerminateWorkerThreadOnMainThread() {
   m_client->workerContextDestroyed();
   // The lifetime of this proxy is controlled by the worker context.
   delete this;
@@ skipping 106 matching lines @@
 
   // SharedWorker 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);
 
   m_loaderProxy = WorkerLoaderProxy::create(this);
-  m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this);
+  m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this,
+                                              m_parentFrameTaskRunners.get());
   InspectorInstrumentation::scriptImported(m_loadingDocument.get(),
                                            m_mainScriptLoader->identifier(),
                                            m_mainScriptLoader->script());
   m_mainScriptLoader.clear();
 
   workerThread()->start(std::move(startupData));
   m_workerInspectorProxy->workerThreadCreated(
       toDocument(m_loadingDocument.get()), workerThread(), m_url);
   m_client->workerScriptLoaded();
 }
@@ skipping 38 matching lines @@
   if (devtoolsAgent)
     devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method,
                                               message);
 }
 
 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) {
   return new WebSharedWorkerImpl(client);
 }
 
 }  // namespace blink