workers: Rename WorkerThread to WorkerScript.

Source/core/workers/WorkerGlobalScope.h

 /*
  * Copyright (C) 2008, 2009 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 41 matching lines @@
 namespace blink {
 
 class ConsoleMessage;
 class ConsoleMessageStorage;
 class ExceptionState;
 class WorkerClients;
 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();
     REFCOUNTED_EVENT_TARGET(WorkerGlobalScope);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope);
 public:
     virtual ~WorkerGlobalScope();
 
     bool isWorkerGlobalScope() const override final { return true; }
 
     ExecutionContext* executionContext() const override final;
 
     virtual void countFeature(UseCounter::Feature) const;
     virtual void countDeprecation(UseCounter::Feature) const;
 
     const KURL& url() const { return m_url; }
     KURL completeURL(const String&) const;
 
     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.
 
     // WorkerGlobalScope
     WorkerGlobalScope* self() { return this; }
     WorkerConsole* console();
     WorkerLocation* location() const;
     void close();
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
@@ skipping 35 matching lines @@
 
     void exceptionHandled(int exceptionId, bool isHandled);
 
     virtual void scriptLoaded(size_t scriptSize, size_t cachedMetadataSize) { }
 
     bool isPrivilegedContext(String& errorMessage, const PrivilegeContextCheck = StandardPrivilegeCheck) override;
 
     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;
     void addMessageToWorkerConsole(PassRefPtrWillBeRawPtr<ConsoleMessage>);
     void setV8CacheOptions(V8CacheOptions v8CacheOptions) { m_v8CacheOptions = v8CacheOptions; }
 
     void removeURLFromMemoryCache(const KURL&) override;
 
 private:
 #if !ENABLE(OILPAN)
     void refExecutionContext() override final { ref(); }
     void derefExecutionContext() override final { deref(); }
 #endif
 
     const KURL& virtualURL() const override final;
     KURL virtualCompleteURL(const String&) const override final;
 
     void reportBlockedScriptExecutionToInspector(const String& directiveText) override final;
 
     EventTarget* errorEventTarget() override final;
     void didUpdateSecurityOrigin() override final { }
 
-    void clearScript() { m_script.clear(); }
     void clearInspector();
 
     static void removeURLFromMemoryCacheInternal(const KURL&);
 
     KURL m_url;
     String m_userAgent;
     V8CacheOptions m_v8CacheOptions;
 
     mutable PersistentWillBeMember<WorkerConsole> m_console;
     mutable PersistentWillBeMember<WorkerLocation> m_location;
     mutable PersistentWillBeMember<WorkerNavigator> m_navigator;
 
     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;
 
     OwnPtrWillBeMember<WorkerEventQueue> m_eventQueue;
 
     OwnPtrWillBeMember<WorkerClients> m_workerClients;
 
     DOMTimerCoordinator m_timers;
 
     double m_timeOrigin;
 
     OwnPtrWillBeMember<ConsoleMessageStorage> m_messageStorage;
 
     unsigned long m_workerExceptionUniqueIdentifier;
     WillBeHeapHashMap<unsigned long, RefPtrWillBeMember<ConsoleMessage>> m_pendingMessages;
 };
 
 DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorkerGlobalScope(), context.isWorkerGlobalScope());
 
 } // namespace blink
 
 #endif // WorkerGlobalScope_h