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 <stdlib.h> | 5 #include <stdlib.h> |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <dwmapi.h> | 8 #include <dwmapi.h> |
9 #include <windows.h> | 9 #include <windows.h> |
10 #endif | 10 #endif |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 watchdog_thread->StartWithOptions(options); | 218 watchdog_thread->StartWithOptions(options); |
219 } | 219 } |
220 | 220 |
221 // Initializes StatisticsRecorder which tracks UMA histograms. | 221 // Initializes StatisticsRecorder which tracks UMA histograms. |
222 base::StatisticsRecorder::Initialize(); | 222 base::StatisticsRecorder::Initialize(); |
223 | 223 |
224 gpu::GPUInfo gpu_info; | 224 gpu::GPUInfo gpu_info; |
225 // Get vendor_id, device_id, driver_version from browser process through | 225 // Get vendor_id, device_id, driver_version from browser process through |
226 // commandline switches. | 226 // commandline switches. |
227 GetGpuInfoFromCommandLine(gpu_info, command_line); | 227 GetGpuInfoFromCommandLine(gpu_info, command_line); |
| 228 gpu_info.in_process_gpu = false; |
228 | 229 |
229 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) | 230 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
230 VaapiWrapper::PreSandboxInitialization(); | 231 VaapiWrapper::PreSandboxInitialization(); |
231 #endif | 232 #endif |
232 | 233 |
233 // Warm up resources that don't need access to GPUInfo. | 234 // Warm up resources that don't need access to GPUInfo. |
234 if (WarmUpSandbox(command_line)) { | 235 if (WarmUpSandbox(command_line)) { |
235 #if defined(OS_LINUX) | 236 #if defined(OS_LINUX) |
236 bool initialized_sandbox = false; | 237 bool initialized_sandbox = false; |
237 bool initialized_gl_context = false; | 238 bool initialized_gl_context = false; |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
550 return true; | 551 return true; |
551 } | 552 } |
552 | 553 |
553 return false; | 554 return false; |
554 } | 555 } |
555 #endif // defined(OS_WIN) | 556 #endif // defined(OS_WIN) |
556 | 557 |
557 } // namespace. | 558 } // namespace. |
558 | 559 |
559 } // namespace content | 560 } // namespace content |
OLD | NEW |