OLD | NEW |
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 const String& sourceCode, | 60 const String& sourceCode, |
61 std::unique_ptr<Vector<char>> cachedMetaData, | 61 std::unique_ptr<Vector<char>> cachedMetaData, |
62 WorkerThreadStartMode startMode, | 62 WorkerThreadStartMode startMode, |
63 const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, | 63 const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, |
64 const String& referrerPolicy, | 64 const String& referrerPolicy, |
65 const SecurityOrigin* starterOrigin, | 65 const SecurityOrigin* starterOrigin, |
66 WorkerClients* workerClients, | 66 WorkerClients* workerClients, |
67 WebAddressSpace addressSpace, | 67 WebAddressSpace addressSpace, |
68 const Vector<String>* originTrialTokens, | 68 const Vector<String>* originTrialTokens, |
69 std::unique_ptr<WorkerSettings> workerSettings, | 69 std::unique_ptr<WorkerSettings> workerSettings, |
70 WorkerV8Settings workerV8Settings, | 70 WorkerV8Settings workerV8Settings) { |
71 bool inspectorNetworkCapability) { | |
72 return WTF::wrapUnique(new WorkerThreadStartupData( | 71 return WTF::wrapUnique(new WorkerThreadStartupData( |
73 scriptURL, userAgent, sourceCode, std::move(cachedMetaData), startMode, | 72 scriptURL, userAgent, sourceCode, std::move(cachedMetaData), startMode, |
74 contentSecurityPolicyHeaders, referrerPolicy, starterOrigin, | 73 contentSecurityPolicyHeaders, referrerPolicy, starterOrigin, |
75 workerClients, addressSpace, originTrialTokens, | 74 workerClients, addressSpace, originTrialTokens, |
76 std::move(workerSettings), workerV8Settings, | 75 std::move(workerSettings), workerV8Settings)); |
77 inspectorNetworkCapability)); | |
78 } | 76 } |
79 | 77 |
80 ~WorkerThreadStartupData(); | 78 ~WorkerThreadStartupData(); |
81 | 79 |
82 KURL m_scriptURL; | 80 KURL m_scriptURL; |
83 String m_userAgent; | 81 String m_userAgent; |
84 String m_sourceCode; | 82 String m_sourceCode; |
85 std::unique_ptr<Vector<char>> m_cachedMetaData; | 83 std::unique_ptr<Vector<char>> m_cachedMetaData; |
86 WorkerThreadStartMode m_startMode; | 84 WorkerThreadStartMode m_startMode; |
87 std::unique_ptr<Vector<CSPHeaderAndType>> m_contentSecurityPolicyHeaders; | 85 std::unique_ptr<Vector<CSPHeaderAndType>> m_contentSecurityPolicyHeaders; |
(...skipping 20 matching lines...) Expand all Loading... |
108 // persistent reference. If the worker thread creation context | 106 // persistent reference. If the worker thread creation context |
109 // supplies no extra 'clients', m_workerClients can be left as empty/null. | 107 // supplies no extra 'clients', m_workerClients can be left as empty/null. |
110 CrossThreadPersistent<WorkerClients> m_workerClients; | 108 CrossThreadPersistent<WorkerClients> m_workerClients; |
111 | 109 |
112 WebAddressSpace m_addressSpace; | 110 WebAddressSpace m_addressSpace; |
113 | 111 |
114 std::unique_ptr<WorkerSettings> m_workerSettings; | 112 std::unique_ptr<WorkerSettings> m_workerSettings; |
115 | 113 |
116 WorkerV8Settings m_workerV8Settings; | 114 WorkerV8Settings m_workerV8Settings; |
117 | 115 |
118 const bool m_inspectorNetworkCapability; | |
119 | |
120 private: | 116 private: |
121 WorkerThreadStartupData( | 117 WorkerThreadStartupData( |
122 const KURL& scriptURL, | 118 const KURL& scriptURL, |
123 const String& userAgent, | 119 const String& userAgent, |
124 const String& sourceCode, | 120 const String& sourceCode, |
125 std::unique_ptr<Vector<char>> cachedMetaData, | 121 std::unique_ptr<Vector<char>> cachedMetaData, |
126 WorkerThreadStartMode, | 122 WorkerThreadStartMode, |
127 const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, | 123 const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, |
128 const String& referrerPolicy, | 124 const String& referrerPolicy, |
129 const SecurityOrigin*, | 125 const SecurityOrigin*, |
130 WorkerClients*, | 126 WorkerClients*, |
131 WebAddressSpace, | 127 WebAddressSpace, |
132 const Vector<String>* originTrialTokens, | 128 const Vector<String>* originTrialTokens, |
133 std::unique_ptr<WorkerSettings>, | 129 std::unique_ptr<WorkerSettings>, |
134 WorkerV8Settings, | 130 WorkerV8Settings); |
135 bool inspectorNetworkCapability); | |
136 }; | 131 }; |
137 | 132 |
138 } // namespace blink | 133 } // namespace blink |
139 | 134 |
140 #endif // WorkerThreadStartupData_h | 135 #endif // WorkerThreadStartupData_h |
OLD | NEW |