Turn WorkerLoaderProxy into a threadsafe, ref-counted object.

Source/web/WebSharedWorkerImpl.h

 /*
  * 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 26 matching lines @@
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerScriptLoaderClient.h"
 #include "core/workers/WorkerThread.h"
 #include "public/web/WebContentSecurityPolicy.h"
 #include "public/web/WebDevToolsAgentClient.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebSharedWorkerClient.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
-#include "wtf/WeakPtr.h"
 
 namespace blink {
 
 class ConsoleMessage;
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebString;
 class WebURL;
 class WebView;
 class WebSharedWorkerClient;
 class WorkerInspectorProxy;
 
 // This class is used by the worker process code to talk to the SharedWorker implementation.
 // It can't use it directly since it uses WebKit types, so this class converts the data types.
 // When the SharedWorker object wants to call WorkerReportingProxy, this class will
 // convert to Chrome data types first and then call the supplied WebCommonWorkerClient.
 class WebSharedWorkerImpl final
     : public WorkerReportingProxy
-    , public WorkerLoaderProxy
     , public WebFrameClient
     , public WebSharedWorker
-    , public WebDevToolsAgentClient {
+    , public WebDevToolsAgentClient
+    , private WorkerLoaderProxyProvider {
 public:
     explicit WebSharedWorkerImpl(WebSharedWorkerClient*);
 
     // WorkerReportingProxy methods:
     virtual void reportException(
         const WTF::String&, int, int, const WTF::String&, int) override;
     virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) override;
     virtual void postMessageToPageInspector(const WTF::String&) override;
     virtual void postWorkerConsoleAgentEnabled() override { }
     virtual void didEvaluateWorkerScript(bool success) override { };
     virtual void workerGlobalScopeStarted(WorkerGlobalScope*) override;
     virtual void workerGlobalScopeClosed() override;
     virtual void workerThreadTerminated() override;
     virtual void willDestroyWorkerGlobalScope() override { }
 
-    // WorkerLoaderProxy methods:
-    virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) override;
-    virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) override;
-
     // WebFrameClient methods to support resource loading thru the 'shadow page'.
     virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) override;
     virtual void didFinishDocumentLoad(WebLocalFrame*) override;
 
     // WebDevToolsAgentClient overrides.
     virtual void sendProtocolMessage(int callId, const WebString&, const WebString&) override;
     virtual void resumeStartup() override;
 
     // WebSharedWorker methods:
     virtual void startWorkerContext(const WebURL&, const WebString& name, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType) override;
@@ skipping 27 matching lines @@
     void didReceiveScriptLoaderResponse();
     void onScriptLoaderFinished();
 
     static void connectTask(ExecutionContext*, PassOwnPtr<WebMessagePortChannel>);
     // Tasks that are run on the main thread.
     void workerGlobalScopeClosedOnMainThread();
     void workerThreadTerminatedOnMainThread();
 
     void postMessageToPageInspectorOnMainThread(const String& message);
 
+    // WorkerLoaderProxyProvider
+    void postTaskToLoader(PassOwnPtr<ExecutionContextTask>);
+    bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>);
+
     // 'shadow page' - created to proxy loading requests from the worker.
     RefPtrWillBePersistent<ExecutionContext> m_loadingDocument;
     WebView* m_webView;
     WebFrame* m_mainFrame;
     bool m_askedToTerminate;
 
     OwnPtr<WorkerInspectorProxy> m_workerInspectorProxy;
 
     RefPtr<WorkerThread> m_workerThread;
 
     // This one's initialized and bound to the main thread.
     RefPtr<WeakReference<WebSharedWorkerClient>> m_client;
 
     // Usually WeakPtr is created by WeakPtrFactory exposed by Client
     // class itself, but here it's implemented by Chrome so we create
     // our own WeakPtr.
     WeakPtr<WebSharedWorkerClient> m_clientWeakPtr;
 
     bool m_pauseWorkerContextOnStart;
     bool m_isPausedOnStart;
 
     // Kept around only while main script loading is ongoing.
     OwnPtr<Loader> m_mainScriptLoader;
+
+    RefPtr<WorkerLoaderProxy> m_loaderProxy;
+
     WebURL m_url;
     WebString m_name;
     WebString m_contentSecurityPolicy;
     WebContentSecurityPolicyType m_policyType;
 };
 
 } // namespace blink
 
-#endif
+#endif // WebSharedWorkerImpl_h