Remove WorkerScriptLoaderClient and inheritances

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 18 matching lines @@
  */
 
 #ifndef WebSharedWorkerImpl_h
 #define WebSharedWorkerImpl_h
 
 #include "public/web/WebSharedWorker.h"
 
 #include "core/dom/ExecutionContext.h"
 #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"
 
 namespace blink {
 
 class ConsoleMessage;
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebLocalFrameImpl;
 class WebServiceWorkerNetworkProvider;
 class WebSharedWorkerClient;
 class WebString;
 class WebURL;
 class WebView;
 class WorkerInspectorProxy;
+class WorkerScriptLoader;
 
-// 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.
+// 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 WebFrameClient
     , public WebSharedWorker
     , public WebDevToolsAgentClient
     , private WorkerLoaderProxyProvider {
 public:
     explicit WebSharedWorkerImpl(WebSharedWorkerClient*);
 
     // WorkerReportingProxy methods:
-    virtual void reportException(
+    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 { }
+    void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) override;
+    void postMessageToPageInspector(const WTF::String&) override;
+    void postWorkerConsoleAgentEnabled() override { }
+    void didEvaluateWorkerScript(bool success) override { };
+    void workerGlobalScopeStarted(WorkerGlobalScope*) override;
+    void workerGlobalScopeClosed() override;
+    void workerThreadTerminated() override;
+    void willDestroyWorkerGlobalScope() override { }
 
     // WebFrameClient methods to support resource loading thru the 'shadow page'.
-    virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) override;
-    virtual void willSendRequest(WebLocalFrame*, unsigned identifier, WebURLRequest&, const WebURLResponse& redirectResponse) override;
-    virtual void didFinishDocumentLoad(WebLocalFrame*) override;
-    virtual bool isControlledByServiceWorker(WebDataSource&) override;
-    virtual int64_t serviceWorkerID(WebDataSource&) override;
+    WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) override;
+    void willSendRequest(WebLocalFrame*, unsigned identifier, WebURLRequest&, const WebURLResponse& redirectResponse) override;
+    void didFinishDocumentLoad(WebLocalFrame*) override;
+    bool isControlledByServiceWorker(WebDataSource&) override;
+    int64_t serviceWorkerID(WebDataSource&) override;
 
     // WebDevToolsAgentClient overrides.
-    virtual void sendProtocolMessage(int callId, const WebString&, const WebString&) override;
-    virtual void resumeStartup() override;
+    void sendProtocolMessage(int callId, const WebString&, const WebString&) override;
+    void resumeStartup() override;
 
     // WebSharedWorker methods:
-    virtual void startWorkerContext(const WebURL&, const WebString& name, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType) override;
-    virtual void connect(WebMessagePortChannel*) override;
-    virtual void terminateWorkerContext() override;
+    void startWorkerContext(const WebURL&, const WebString& name, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType) override;
+    void connect(WebMessagePortChannel*) override;
+    void terminateWorkerContext() override;
 
-    virtual void pauseWorkerContextOnStart() override;
-    virtual void attachDevTools(const WebString& hostId) override;
-    virtual void reattachDevTools(const WebString& hostId, const WebString& savedState) override;
-    virtual void detachDevTools() override;
-    virtual void dispatchDevToolsMessage(const WebString&) override;
+    void pauseWorkerContextOnStart() override;
+    void attachDevTools(const WebString& hostId) override;
+    void reattachDevTools(const WebString& hostId, const WebString& savedState) override;
+    void detachDevTools() override;
+    void dispatchDevToolsMessage(const WebString&) override;
 
 private:
-    class Loader;
-
-    virtual ~WebSharedWorkerImpl();
+    ~WebSharedWorkerImpl() override;
 
     void setWorkerThread(PassRefPtr<WorkerThread> thread) { m_workerThread = thread; }
     WorkerThread* workerThread() { return m_workerThread.get(); }
 
     // Shuts down the worker thread.
     void terminateWorkerThread();
 
     // Creates the shadow loader used for worker network requests.
     void initializeLoader();
 
@@ skipping 24 matching lines @@
     OwnPtr<WorkerInspectorProxy> m_workerInspectorProxy;
 
     RefPtr<WorkerThread> m_workerThread;
 
     WebSharedWorkerClient* m_client;
 
     bool m_pauseWorkerContextOnStart;
     bool m_isPausedOnStart;
 
     // Kept around only while main script loading is ongoing.
-    OwnPtr<Loader> m_mainScriptLoader;
+    OwnPtr<WorkerScriptLoader> m_mainScriptLoader;
 
     RefPtr<WorkerLoaderProxy> m_loaderProxy;
 
     WebURL m_url;
     WebString m_name;
 };
 
 } // namespace blink
 
 #endif // WebSharedWorkerImpl_h