Index: Source/core/workers/WorkerScriptStartupData.h |
diff --git a/Source/core/workers/WorkerThreadStartupData.h b/Source/core/workers/WorkerScriptStartupData.h |
similarity index 88% |
rename from Source/core/workers/WorkerThreadStartupData.h |
rename to Source/core/workers/WorkerScriptStartupData.h |
index 36c5d22f7ee769559a4f1d730a32948d70dbaa37..59fb43298438b55e1f435bb99ea279731152dc13 100644 |
--- a/Source/core/workers/WorkerThreadStartupData.h |
+++ b/Source/core/workers/WorkerScriptStartupData.h |
@@ -28,14 +28,14 @@ |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef WorkerThreadStartupData_h |
-#define WorkerThreadStartupData_h |
+#ifndef WorkerScriptStartupData_h |
+#define WorkerScriptStartupData_h |
#include "bindings/core/v8/V8CacheOptions.h" |
#include "core/CoreExport.h" |
#include "core/frame/csp/ContentSecurityPolicy.h" |
#include "core/workers/WorkerClients.h" |
-#include "core/workers/WorkerThread.h" |
+#include "core/workers/WorkerScript.h" |
#include "platform/network/ContentSecurityPolicyParsers.h" |
#include "platform/weborigin/KURL.h" |
#include "wtf/Forward.h" |
@@ -45,16 +45,16 @@ namespace blink { |
class WorkerClients; |
-class CORE_EXPORT WorkerThreadStartupData final { |
- WTF_MAKE_NONCOPYABLE(WorkerThreadStartupData); |
- WTF_MAKE_FAST_ALLOCATED(WorkerThreadStartupData); |
+class CORE_EXPORT WorkerScriptStartupData final { |
+ WTF_MAKE_NONCOPYABLE(WorkerScriptStartupData); |
+ WTF_MAKE_FAST_ALLOCATED(WorkerScriptStartupData); |
public: |
- static PassOwnPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, const SecurityOrigin* starterOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault) |
+ static PassOwnPtr<WorkerScriptStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, const SecurityOrigin* starterOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault) |
{ |
- return adoptPtr(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, cachedMetaData, startMode, contentSecurityPolicy, contentSecurityPolicyType, starterOrigin, workerClients, v8CacheOptions)); |
+ return adoptPtr(new WorkerScriptStartupData(scriptURL, userAgent, sourceCode, cachedMetaData, startMode, contentSecurityPolicy, contentSecurityPolicyType, starterOrigin, workerClients, v8CacheOptions)); |
} |
- ~WorkerThreadStartupData(); |
+ ~WorkerScriptStartupData(); |
KURL m_scriptURL; |
String m_userAgent; |
@@ -80,7 +80,7 @@ public: |
const SecurityOrigin* m_starterOrigin; |
// This object is created and initialized on the thread creating |
- // a new worker context, but ownership of it and this WorkerThreadStartupData |
+ // a new worker context, but ownership of it and this WorkerScriptStartupData |
// structure is passed along to the new worker thread, where it is finalized. |
// |
// Hence, CrossThreadPersistent<> is required to allow finalization |
@@ -91,9 +91,9 @@ public: |
V8CacheOptions m_v8CacheOptions; |
private: |
- WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>, V8CacheOptions); |
+ WorkerScriptStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>, V8CacheOptions); |
}; |
} // namespace blink |
-#endif // WorkerThreadStartupData_h |
+#endif // WorkerScriptStartupData_h |