Chromium Code Reviews| 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 217 watchdog_thread->StartWithOptions(options); | 217 watchdog_thread->StartWithOptions(options); |
| 218 } | 218 } |
| 219 | 219 |
| 220 // Initializes StatisticsRecorder which tracks UMA histograms. | 220 // Initializes StatisticsRecorder which tracks UMA histograms. |
| 221 base::StatisticsRecorder::Initialize(); | 221 base::StatisticsRecorder::Initialize(); |
| 222 | 222 |
| 223 gpu::GPUInfo gpu_info; | 223 gpu::GPUInfo gpu_info; |
| 224 // Get vendor_id, device_id, driver_version from browser process through | 224 // Get vendor_id, device_id, driver_version from browser process through |
| 225 // commandline switches. | 225 // commandline switches. |
| 226 GetGpuInfoFromCommandLine(gpu_info, command_line); | 226 GetGpuInfoFromCommandLine(gpu_info, command_line); |
| 227 gpu_info.in_process_gpu = false; | |
|
Ken Russell (switch to Gerrit)
2015/07/23 20:09:29
Out of curiosity do you know where this would be s
| |
| 227 | 228 |
| 228 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) | 229 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
| 229 VaapiWrapper::PreSandboxInitialization(); | 230 VaapiWrapper::PreSandboxInitialization(); |
| 230 #endif | 231 #endif |
| 231 | 232 |
| 232 // Warm up resources that don't need access to GPUInfo. | 233 // Warm up resources that don't need access to GPUInfo. |
| 233 if (WarmUpSandbox(command_line)) { | 234 if (WarmUpSandbox(command_line)) { |
| 234 #if defined(OS_LINUX) | 235 #if defined(OS_LINUX) |
| 235 bool initialized_sandbox = false; | 236 bool initialized_sandbox = false; |
| 236 bool initialized_gl_context = false; | 237 bool initialized_gl_context = false; |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 547 return true; | 548 return true; |
| 548 } | 549 } |
| 549 | 550 |
| 550 return false; | 551 return false; |
| 551 } | 552 } |
| 552 #endif // defined(OS_WIN) | 553 #endif // defined(OS_WIN) |
| 553 | 554 |
| 554 } // namespace. | 555 } // namespace. |
| 555 | 556 |
| 556 } // namespace content | 557 } // namespace content |
| OLD | NEW |