Rename WorkerThread to WorkerScript

third_party/WebKit/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/WorkerThread.h"
+#include "core/workers/WorkerScript.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;
@@ skipping 25 matching lines @@
 
     // WorkerReportingProxy methods:
     void reportException(
         const WTF::String&, int, int, const WTF::String&, int) 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 workerScriptTerminated() override;
     void willDestroyWorkerGlobalScope() override { }
 
     // WebFrameClient methods to support resource loading thru the 'shadow page'.
     WebApplicationCacheHost* createApplicationCacheHost(WebApplicationCacheHostClient*) override;
     void willSendRequest(WebLocalFrame*, unsigned identifier, WebURLRequest&, const WebURLResponse& redirectResponse) override;
     void didFinishDocumentLoad(WebLocalFrame*, bool documentIsEmpty) override;
     bool isControlledByServiceWorker(WebDataSource&) override;
     int64_t serviceWorkerID(WebDataSource&) override;
 
     // WebDevToolsAgentClient overrides.
     void sendProtocolMessage(int sessionId, int callId, const WebString&, const WebString&) override;
     void resumeStartup() override;
 
     // WebSharedWorker methods:
     void startWorkerContext(const WebURL&, const WebString& name, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType) override;
     void connect(WebMessagePortChannel*) override;
     void terminateWorkerContext() override;
 
     void pauseWorkerContextOnStart() override;
     void attachDevTools(const WebString& hostId, int sessionId) override;
     void reattachDevTools(const WebString& hostId, int sesionId, const WebString& savedState) override;
     void detachDevTools() override;
     void dispatchDevToolsMessage(int sessionId, const WebString&) override;
 
 private:
     ~WebSharedWorkerImpl() override;
 
-    void setWorkerThread(PassRefPtr<WorkerThread> thread) { m_workerThread = thread; }
-    WorkerThread* workerThread() { return m_workerThread.get(); }
+    void setWorkerScript(PassRefPtr<WorkerScript> script) { m_workerScript = script; }
+    WorkerScript* workerScript() { return m_workerScript.get(); }
 
     // Shuts down the worker thread.
-    void terminateWorkerThread();
+    void terminateWorkerScript();
 
     // Creates the shadow loader used for worker network requests.
     void initializeLoader();
 
     void loadShadowPage();
     void didReceiveScriptLoaderResponse();
     void onScriptLoaderFinished();
 
     static void connectTask(PassOwnPtr<WebMessagePortChannel>, ExecutionContext*);
     // Tasks that are run on the main thread.
     void workerGlobalScopeClosedOnMainThread();
-    void workerThreadTerminatedOnMainThread();
+    void workerScriptTerminatedOnMainThread();
 
     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;
     RefPtrWillBePersistent<WebLocalFrameImpl> m_mainFrame;
     bool m_askedToTerminate;
 
     // This one is bound to and used only on the main thread.
     OwnPtr<WebServiceWorkerNetworkProvider> m_networkProvider;
 
     OwnPtrWillBePersistent<WorkerInspectorProxy> m_workerInspectorProxy;
 
-    RefPtr<WorkerThread> m_workerThread;
+    RefPtr<WorkerScript> m_workerScript;
 
     WebSharedWorkerClient* m_client;
 
     bool m_pauseWorkerContextOnStart;
     bool m_isPausedOnStart;
 
     // Kept around only while main script loading is ongoing.
     RefPtr<WorkerScriptLoader> m_mainScriptLoader;
 
     RefPtr<WorkerLoaderProxy> m_loaderProxy;
 
     WebURL m_url;
     WebString m_name;
 };
 
 } // namespace blink
 
 #endif // WebSharedWorkerImpl_h