Turn WorkerLoaderProxy into a threadsafe, ref-counted object.

Source/core/workers/WorkerThread.h

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef WorkerThread_h
 #define WorkerThread_h
 
 #include "core/dom/ExecutionContextTask.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/workers/WorkerGlobalScope.h"
+#include "core/workers/WorkerLoaderProxy.h"
 #include "platform/SharedTimer.h"
 #include "platform/WebThreadSupportingGC.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/Forward.h"
 #include "wtf/MessageQueue.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 
 namespace blink {
 
 class WebWaitableEvent;
 class WorkerGlobalScope;
 class WorkerInspectorController;
-class WorkerLoaderProxy;
 class WorkerReportingProxy;
 class WorkerSharedTimer;
 class WorkerThreadShutdownFinishTask;
 class WorkerThreadStartupData;
 class WorkerThreadTask;
 
 enum WorkerThreadStartMode {
     DontPauseWorkerGlobalScopeOnStart,
     PauseWorkerGlobalScopeOnStart
 };
@@ skipping 10 matching lines @@
 
     // Can be used to wait for this worker thread to shut down.
     // (This is signalled on the main thread, so it's assumed to be waited on the worker context thread)
     WebWaitableEvent* shutdownEvent() { return m_shutdownEvent.get(); }
 
     WebWaitableEvent* terminationEvent() { return m_terminationEvent.get(); }
     void terminateAndWait();
     static void terminateAndWaitForAllWorkers();
 
     bool isCurrentThread() const;
-    WorkerLoaderProxy& workerLoaderProxy() const { return m_workerLoaderProxy; }
+    WorkerLoaderProxy* workerLoaderProxy() const
+    {
+        RELEASE_ASSERT(m_workerLoaderProxy);
+        return m_workerLoaderProxy.get();
+    }
+
     WorkerReportingProxy& workerReportingProxy() const { return m_workerReportingProxy; }
 
     void postTask(PassOwnPtr<ExecutionContextTask>);
     void postDebuggerTask(PassOwnPtr<ExecutionContextTask>);
 
     enum WaitMode { WaitForMessage, DontWaitForMessage };
     MessageQueueWaitResult runDebuggerTask(WaitMode = WaitForMessage);
 
     // These methods should be called if the holder of the thread is
     // going to call runDebuggerTask in a loop.
     void willEnterNestedLoop();
     void didLeaveNestedLoop();
 
     WorkerGlobalScope* workerGlobalScope() const { return m_workerGlobalScope.get(); }
     bool terminated();
 
     // Number of active worker threads.
     static unsigned workerThreadCount();
 
     PlatformThreadId platformThreadId() const;
 
     void interruptAndDispatchInspectorCommands();
     void setWorkerInspectorController(WorkerInspectorController*);
 
 protected:
-    WorkerThread(WorkerLoaderProxy&, WorkerReportingProxy&, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>);
+    WorkerThread(PassRefPtr<WorkerLoaderProxy>, WorkerReportingProxy&, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>);
 
     // Factory method for creating a new worker context for the thread.
     virtual PassRefPtrWillBeRawPtr<WorkerGlobalScope> createWorkerGlobalScope(PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>) = 0;
 
     virtual void postInitialize() { }
 
 private:
     friend class WorkerSharedTimer;
     friend class WorkerThreadShutdownFinishTask;
 
     void stopInShutdownSequence();
     void stopInternal();
 
     void initialize();
     void cleanup();
     void idleHandler();
     void postDelayedTask(PassOwnPtr<ExecutionContextTask>, long long delayMs);
 
     bool m_terminated;
     OwnPtr<WorkerSharedTimer> m_sharedTimer;
     MessageQueue<WorkerThreadTask> m_debuggerMessageQueue;
     OwnPtr<WebThread::TaskObserver> m_microtaskRunner;
 
-    WorkerLoaderProxy& m_workerLoaderProxy;
+    RefPtr<WorkerLoaderProxy> m_workerLoaderProxy;
     WorkerReportingProxy& m_workerReportingProxy;
 
     RefPtrWillBePersistent<WorkerInspectorController> m_workerInspectorController;
     Mutex m_workerInspectorControllerMutex;
 
     Mutex m_threadCreationMutex;
     RefPtrWillBePersistent<WorkerGlobalScope> m_workerGlobalScope;
     OwnPtrWillBePersistent<WorkerThreadStartupData> m_startupData;
 
     // Used to signal thread shutdown.
     OwnPtr<WebWaitableEvent> m_shutdownEvent;
 
     // Used to signal thread termination.
     OwnPtr<WebWaitableEvent> m_terminationEvent;
 
     // FIXME: This has to be last because of crbug.com/401397 - the
     // WorkerThread might get deleted before it had a chance to properly
     // shut down. By deleting the WebThread first, we can guarantee that
     // no pending tasks on the thread might want to access any of the other
     // members during the WorkerThread's destruction.
     OwnPtr<WebThreadSupportingGC> m_thread;
 };
 
 } // namespace blink
 
 #endif // WorkerThread_h