Worker: Remove WorkerLoaderProxy for clean-up

third_party/WebKit/Source/modules/webaudio/AudioWorkletThread.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/webaudio/AudioWorkletThread.h"
 
 #include <memory>
 #include "core/workers/WorkerBackingThread.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "modules/webaudio/AudioWorkletGlobalScope.h"
 #include "platform/CrossThreadFunctional.h"
 #include "platform/WaitableEvent.h"
 #include "platform/WebThreadSupportingGC.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/wtf/Assertions.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 template class WorkletThreadHolder<AudioWorkletThread>;
 
 std::unique_ptr<AudioWorkletThread> AudioWorkletThread::Create(
-    PassRefPtr<WorkerLoaderProxy> worker_loader_proxy,
+    ThreadableLoadingContext* loading_context,
     WorkerReportingProxy& worker_reporting_proxy) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("audio-worklet"),
                "AudioWorkletThread::create");
   DCHECK(IsMainThread());
-  return WTF::WrapUnique(new AudioWorkletThread(std::move(worker_loader_proxy),
-                                                worker_reporting_proxy));
+  return WTF::WrapUnique(
+      new AudioWorkletThread(loading_context, worker_reporting_proxy));

[haraken, 2017/04/25 16:53:43]

MakeUnique

[nhiroki, 2017/05/29 04:20:24]

Let me keep this as is for now because (1) MakeUnique cannot access the private
ctor, (2) providing both Create() and the public ctor look duplicate, and (3)
removing Create() in favor of the public ctor could change the behavior of
TRACE_EVENT in Create() (I'd like to avoid such change in this big CL as much as
possible).

 }
 
 AudioWorkletThread::AudioWorkletThread(
-    PassRefPtr<WorkerLoaderProxy> worker_loader_proxy,
+    ThreadableLoadingContext* loading_context,
     WorkerReportingProxy& worker_reporting_proxy)
-    : WorkerThread(std::move(worker_loader_proxy), worker_reporting_proxy) {}
+    : WorkerThread(loading_context, worker_reporting_proxy) {}
 
 AudioWorkletThread::~AudioWorkletThread() {}
 
 WorkerBackingThread& AudioWorkletThread::GetWorkerBackingThread() {
   return *WorkletThreadHolder<AudioWorkletThread>::GetInstance()->GetThread();
 }
 
 void CollectAllGarbageOnAudioWorkletThread(WaitableEvent* done_event) {
   blink::ThreadState::Current()->CollectAllGarbage();
   done_event->Signal();
@@ skipping 37 matching lines @@
     security_origin->TransferPrivilegesFrom(
         std::move(startup_data->starter_origin_privilege_data_));
   }
 
   return AudioWorkletGlobalScope::Create(
       startup_data->script_url_, startup_data->user_agent_,
       security_origin.Release(), this->GetIsolate(), this);
 }
 
 }  // namespace blink