Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: Source/core/workers/WorkerThreadStartupData.cpp

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/workers/WorkerThreadStartupData.h" 32 #include "core/workers/WorkerThreadStartupData.h"
33 33
34 #include "platform/network/ContentSecurityPolicyParsers.h" 34 #include "platform/network/ContentSecurityPolicyParsers.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 WorkerThreadStartupData::WorkerThreadStartupData(const KURL& scriptURL, const St ring& userAgent, const String& sourceCode, WorkerThreadStartMode startMode, cons t String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurity PolicyType, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients) 38 WorkerThreadStartupData::WorkerThreadStartupData(const KURL& scriptURL, const St ring& userAgent, const String& sourceCode, WorkerThreadStartMode startMode, cons t String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurity PolicyType, SecurityOrigin::PolicyOverrides originPolicyOverrides, PassOwnPtrWil lBeRawPtr<WorkerClients> workerClients)
39 : m_scriptURL(scriptURL.copy()) 39 : m_scriptURL(scriptURL.copy())
40 , m_userAgent(userAgent.isolatedCopy()) 40 , m_userAgent(userAgent.isolatedCopy())
41 , m_sourceCode(sourceCode.isolatedCopy()) 41 , m_sourceCode(sourceCode.isolatedCopy())
42 , m_startMode(startMode) 42 , m_startMode(startMode)
43 , m_contentSecurityPolicy(contentSecurityPolicy.isolatedCopy()) 43 , m_contentSecurityPolicy(contentSecurityPolicy.isolatedCopy())
44 , m_contentSecurityPolicyType(contentSecurityPolicyType) 44 , m_contentSecurityPolicyType(contentSecurityPolicyType)
45 , m_originPolicyOverrides(originPolicyOverrides)
45 , m_workerClients(workerClients) 46 , m_workerClients(workerClients)
46 { 47 {
47 } 48 }
48 49
49 WorkerThreadStartupData::~WorkerThreadStartupData() 50 WorkerThreadStartupData::~WorkerThreadStartupData()
50 { 51 {
51 } 52 }
52 53
53 void WorkerThreadStartupData::trace(Visitor* visitor) 54 void WorkerThreadStartupData::trace(Visitor* visitor)
54 { 55 {
55 visitor->trace(m_workerClients); 56 visitor->trace(m_workerClients);
56 } 57 }
57 58
58 } // namespace blink 59 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698