| Index: third_party/WebKit/Source/core/workers/WorkerScriptStartupData.h
|
| diff --git a/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h b/third_party/WebKit/Source/core/workers/WorkerScriptStartupData.h
|
| similarity index 84%
|
| rename from third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h
|
| rename to third_party/WebKit/Source/core/workers/WorkerScriptStartupData.h
|
| index 728ae120fdee10ce3ec349fe128a1a440f96ee29..4ed0de158e01363bcf81cc451b5c6c27f173e63d 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h
|
| +++ b/third_party/WebKit/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,22 +45,22 @@ namespace blink {
|
|
|
| class WorkerClients;
|
|
|
| -class CORE_EXPORT WorkerThreadStartupData final {
|
| - WTF_MAKE_NONCOPYABLE(WorkerThreadStartupData);
|
| - USING_FAST_MALLOC(WorkerThreadStartupData);
|
| +class CORE_EXPORT WorkerScriptStartupData final {
|
| + WTF_MAKE_NONCOPYABLE(WorkerScriptStartupData);
|
| + USING_FAST_MALLOC(WorkerScriptStartupData);
|
| public:
|
| - static PassOwnPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const PassOwnPtr<Vector<CSPHeaderAndType>> contentSecurityPolicyHeaders, 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, WorkerScriptStartMode startMode, const PassOwnPtr<Vector<CSPHeaderAndType>> contentSecurityPolicyHeaders, const SecurityOrigin* starterOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault)
|
| {
|
| - return adoptPtr(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, cachedMetaData, startMode, contentSecurityPolicyHeaders, starterOrigin, workerClients, v8CacheOptions));
|
| + return adoptPtr(new WorkerScriptStartupData(scriptURL, userAgent, sourceCode, cachedMetaData, startMode, contentSecurityPolicyHeaders, starterOrigin, workerClients, v8CacheOptions));
|
| }
|
|
|
| - ~WorkerThreadStartupData();
|
| + ~WorkerScriptStartupData();
|
|
|
| KURL m_scriptURL;
|
| String m_userAgent;
|
| String m_sourceCode;
|
| OwnPtr<Vector<char>> m_cachedMetaData;
|
| - WorkerThreadStartMode m_startMode;
|
| + WorkerScriptStartMode m_startMode;
|
| OwnPtr<Vector<CSPHeaderAndType>> m_contentSecurityPolicyHeaders;
|
|
|
| // The SecurityOrigin of the Document creating a Worker may have
|
| @@ -75,7 +75,7 @@ public:
|
| OwnPtr<SecurityOrigin::PrivilegeData> m_starterOriginPrivilegeData;
|
|
|
| // 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
|
| @@ -87,9 +87,9 @@ public:
|
| V8CacheOptions m_v8CacheOptions;
|
|
|
| private:
|
| - WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode, const PassOwnPtr<Vector<CSPHeaderAndType>> contentSecurityPolicyHeaders, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>, V8CacheOptions);
|
| + WorkerScriptStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerScriptStartMode, const PassOwnPtr<Vector<CSPHeaderAndType>> contentSecurityPolicyHeaders, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>, V8CacheOptions);
|
| };
|
|
|
| } // namespace blink
|
|
|
| -#endif // WorkerThreadStartupData_h
|
| +#endif // WorkerScriptStartupData_h
|
|
|