Index: Source/core/workers/WorkerGlobalScope.h |
diff --git a/Source/core/workers/WorkerGlobalScope.h b/Source/core/workers/WorkerGlobalScope.h |
index 267aeae9888828a1ac910bd4718b141a15122402..8709792f20d2093170ff50ef29e5b51e69c3cb73 100644 |
--- a/Source/core/workers/WorkerGlobalScope.h |
+++ b/Source/core/workers/WorkerGlobalScope.h |
@@ -59,7 +59,7 @@ class WorkerConsole; |
class WorkerInspectorController; |
class WorkerLocation; |
class WorkerNavigator; |
-class WorkerThread; |
+class WorkerScript; |
class CORE_EXPORT WorkerGlobalScope : public EventTargetWithInlineData, public RefCountedWillBeNoBase<WorkerGlobalScope>, public SecurityContext, public ExecutionContext, public WillBeHeapSupplementable<WorkerGlobalScope>, public DOMWindowBase64 { |
DEFINE_WRAPPERTYPEINFO(); |
@@ -81,12 +81,12 @@ public: |
String userAgent(const KURL&) const override final; |
void disableEval(const String& errorMessage) override final; |
- WorkerScriptController* script() { return m_script.get(); } |
+ WorkerScriptController* scriptController() { return m_scriptController.get(); } |
virtual void didEvaluateWorkerScript(); |
void dispose(); |
- WorkerThread* thread() const { return m_thread; } |
+ WorkerScript* script() const { return m_script; } |
void postTask(const WebTraceLocation&, PassOwnPtr<ExecutionContextTask>) override final; // Executes the task on context's thread asynchronously. |
@@ -142,7 +142,7 @@ public: |
DECLARE_VIRTUAL_TRACE(); |
protected: |
- WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, double timeOrigin, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>); |
+ WorkerGlobalScope(const KURL&, const String& userAgent, WorkerScript*, double timeOrigin, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>); |
void applyContentSecurityPolicyFromString(const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType); |
void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) override; |
@@ -165,7 +165,6 @@ private: |
EventTarget* errorEventTarget() override final; |
void didUpdateSecurityOrigin() override final { } |
- void clearScript() { m_script.clear(); } |
void clearInspector(); |
static void removeURLFromMemoryCacheInternal(const KURL&); |
@@ -180,8 +179,8 @@ private: |
mutable UseCounter::CountBits m_deprecationWarningBits; |
- OwnPtr<WorkerScriptController> m_script; |
- WorkerThread* m_thread; |
+ OwnPtr<WorkerScriptController> m_scriptController; |
+ WorkerScript* m_script; |
RefPtrWillBeMember<WorkerInspectorController> m_workerInspectorController; |
bool m_closing; |