Source/core/workers/WorkerThreadStartupData.h - Issue 594803002: Transfer SecurityOrigin overrides to Workers.

Unified Diff: Source/core/workers/WorkerThreadStartupData.h

Issue 594803002: Transfer SecurityOrigin overrides to Workers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Add tests Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« Source/core/workers/WorkerMessagingProxy.cpp ('K') | « Source/core/workers/WorkerMessagingProxy.cpp ('k') | Source/core/workers/WorkerThreadStartupData.cpp » ('j') | Source/platform/weborigin/SecurityOrigin.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/workers/WorkerThreadStartupData.h

diff --git a/Source/core/workers/WorkerThreadStartupData.h b/Source/core/workers/WorkerThreadStartupData.h

index 1e85c2cf55a91fbba0b5d7c0b64eb98c6aa25245..192ae7922bddffb25aab31a5e23ddf36e7fa20dd 100644

--- a/Source/core/workers/WorkerThreadStartupData.h

+++ b/Source/core/workers/WorkerThreadStartupData.h

@@ -47,9 +47,9 @@ class WorkerThreadStartupData FINAL : public NoBaseWillBeGarbageCollectedFinaliz

WTF_MAKE_NONCOPYABLE(WorkerThreadStartupData);

WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;

public:

- static PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)

+ static PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, SecurityOrigin::PolicyOverrides originPolicyOverrides, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)

{

- return adoptPtrWillBeNoop(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, startMode, contentSecurityPolicy, contentSecurityPolicyType, workerClients));

+ return adoptPtrWillBeNoop(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, startMode, contentSecurityPolicy, contentSecurityPolicyType, originPolicyOverrides, workerClients));

}

~WorkerThreadStartupData();

@@ -60,12 +60,13 @@ public:

WorkerThreadStartMode m_startMode;

String m_contentSecurityPolicy;

ContentSecurityPolicyHeaderType m_contentSecurityPolicyType;

+ SecurityOrigin::PolicyOverrides m_originPolicyOverrides;

OwnPtrWillBeMember<WorkerClients> m_workerClients;

void trace(Visitor*);

private:

- WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, PassOwnPtrWillBeRawPtr<WorkerClients>);

+ WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, SecurityOrigin::PolicyOverrides originPolicyOverrides, PassOwnPtrWillBeRawPtr<WorkerClients>);

};

} // namespace blink