OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/worker_host/worker_process_host.h" | 5 #include "content/browser/worker_host/worker_process_host.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 | 176 |
177 static const char* const kSwitchNames[] = { | 177 static const char* const kSwitchNames[] = { |
178 switches::kDisableApplicationCache, | 178 switches::kDisableApplicationCache, |
179 switches::kDisableDatabases, | 179 switches::kDisableDatabases, |
180 #if defined(OS_WIN) | 180 #if defined(OS_WIN) |
181 switches::kDisableDesktopNotifications, | 181 switches::kDisableDesktopNotifications, |
182 #endif | 182 #endif |
183 switches::kDisableFileSystem, | 183 switches::kDisableFileSystem, |
184 switches::kDisableSeccompFilterSandbox, | 184 switches::kDisableSeccompFilterSandbox, |
185 switches::kEnableExperimentalWebPlatformFeatures, | 185 switches::kEnableExperimentalWebPlatformFeatures, |
| 186 switches::kEnableMemoryInfo, |
186 switches::kEnableServiceWorker, | 187 switches::kEnableServiceWorker, |
187 #if defined(OS_MACOSX) | 188 #if defined(OS_MACOSX) |
188 switches::kEnableSandboxLogging, | 189 switches::kEnableSandboxLogging, |
189 #endif | 190 #endif |
190 switches::kJavaScriptFlags, | 191 switches::kJavaScriptFlags, |
191 switches::kNoSandbox | 192 switches::kNoSandbox |
192 }; | 193 }; |
193 cmd_line->CopySwitchesFrom(*CommandLine::ForCurrentProcess(), kSwitchNames, | 194 cmd_line->CopySwitchesFrom(*CommandLine::ForCurrentProcess(), kSwitchNames, |
194 arraysize(kSwitchNames)); | 195 arraysize(kSwitchNames)); |
195 | |
196 #if defined(OS_POSIX) | 196 #if defined(OS_POSIX) |
197 bool use_zygote = true; | 197 bool use_zygote = true; |
198 | 198 |
199 if (CommandLine::ForCurrentProcess()->HasSwitch( | 199 if (CommandLine::ForCurrentProcess()->HasSwitch( |
200 switches::kWaitForDebuggerChildren)) { | 200 switches::kWaitForDebuggerChildren)) { |
201 // Look to pass-on the kWaitForDebugger flag. | 201 // Look to pass-on the kWaitForDebugger flag. |
202 std::string value = CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 202 std::string value = CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
203 switches::kWaitForDebuggerChildren); | 203 switches::kWaitForDebuggerChildren); |
204 if (value.empty() || value == switches::kWorkerProcess) { | 204 if (value.empty() || value == switches::kWorkerProcess) { |
205 cmd_line->AppendSwitch(switches::kWaitForDebugger); | 205 cmd_line->AppendSwitch(switches::kWaitForDebugger); |
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
808 return false; | 808 return false; |
809 } | 809 } |
810 | 810 |
811 WorkerProcessHost::WorkerInstance::FilterInfo | 811 WorkerProcessHost::WorkerInstance::FilterInfo |
812 WorkerProcessHost::WorkerInstance::GetFilter() const { | 812 WorkerProcessHost::WorkerInstance::GetFilter() const { |
813 DCHECK(NumFilters() == 1); | 813 DCHECK(NumFilters() == 1); |
814 return *filters_.begin(); | 814 return *filters_.begin(); |
815 } | 815 } |
816 | 816 |
817 } // namespace content | 817 } // namespace content |
OLD | NEW |