| Index: Source/web/WebSharedWorkerImpl.h
|
| diff --git a/Source/web/WebSharedWorkerImpl.h b/Source/web/WebSharedWorkerImpl.h
|
| index 69a18a82e2a49e34837c03b3ca52a98061a17379..ece3050d83ed089580822ebc92095bdd5b7e4dd8 100644
|
| --- a/Source/web/WebSharedWorkerImpl.h
|
| +++ b/Source/web/WebSharedWorkerImpl.h
|
| @@ -65,7 +65,7 @@ class WorkerInspectorProxy;
|
| // 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
|
| +class WebSharedWorkerImpl final
|
| : public WorkerReportingProxy
|
| , public WorkerLoaderProxy
|
| , public WebFrameClient
|
| @@ -76,40 +76,40 @@ public:
|
|
|
| // WorkerReportingProxy methods:
|
| virtual void reportException(
|
| - const WTF::String&, int, int, const WTF::String&) OVERRIDE;
|
| - virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE;
|
| - virtual void postMessageToPageInspector(const WTF::String&) OVERRIDE;
|
| - virtual void updateInspectorStateCookie(const WTF::String&) OVERRIDE;
|
| - virtual void workerGlobalScopeStarted(WorkerGlobalScope*) OVERRIDE;
|
| - virtual void workerGlobalScopeClosed() OVERRIDE;
|
| - virtual void workerThreadTerminated() OVERRIDE;
|
| - virtual void willDestroyWorkerGlobalScope() OVERRIDE { }
|
| + const WTF::String&, int, int, const WTF::String&) override;
|
| + virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) override;
|
| + virtual void postMessageToPageInspector(const WTF::String&) override;
|
| + virtual void updateInspectorStateCookie(const WTF::String&) 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;
|
| + 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;
|
| + virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) override;
|
| + virtual void didFinishDocumentLoad(WebLocalFrame*) override;
|
|
|
| // WebDevToolsAgentClient overrides.
|
| - virtual void sendMessageToInspectorFrontend(const WebString&) OVERRIDE;
|
| - virtual void saveAgentRuntimeState(const WebString&) OVERRIDE;
|
| - virtual void resumeStartup() OVERRIDE;
|
| + virtual void sendMessageToInspectorFrontend(const WebString&) override;
|
| + virtual void saveAgentRuntimeState(const WebString&) override;
|
| + virtual 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;
|
| - virtual void clientDestroyed() OVERRIDE;
|
| -
|
| - virtual void pauseWorkerContextOnStart() OVERRIDE;
|
| - virtual void resumeWorkerContext() 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;
|
| + virtual void startWorkerContext(const WebURL&, const WebString& name, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType) override;
|
| + virtual void connect(WebMessagePortChannel*) override;
|
| + virtual void terminateWorkerContext() override;
|
| + virtual void clientDestroyed() override;
|
| +
|
| + virtual void pauseWorkerContextOnStart() override;
|
| + virtual void resumeWorkerContext() 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;
|
|
|
| private:
|
| class Loader;
|
|
|