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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 &gpu_info.gpu.vendor_id); | 380 &gpu_info.gpu.vendor_id); |
381 DCHECK(success); | 381 DCHECK(success); |
382 success = base::HexStringToUInt( | 382 success = base::HexStringToUInt( |
383 command_line.GetSwitchValueASCII(switches::kGpuDeviceID), | 383 command_line.GetSwitchValueASCII(switches::kGpuDeviceID), |
384 &gpu_info.gpu.device_id); | 384 &gpu_info.gpu.device_id); |
385 DCHECK(success); | 385 DCHECK(success); |
386 gpu_info.driver_vendor = | 386 gpu_info.driver_vendor = |
387 command_line.GetSwitchValueASCII(switches::kGpuDriverVendor); | 387 command_line.GetSwitchValueASCII(switches::kGpuDriverVendor); |
388 gpu_info.driver_version = | 388 gpu_info.driver_version = |
389 command_line.GetSwitchValueASCII(switches::kGpuDriverVersion); | 389 command_line.GetSwitchValueASCII(switches::kGpuDriverVersion); |
| 390 gpu_info.gpu.vendor_string = |
| 391 command_line.GetSwitchValueASCII(switches::kGpuVendorString); |
| 392 gpu_info.gpu.device_string = |
| 393 command_line.GetSwitchValueASCII(switches::kGpuDeviceString); |
390 GetContentClient()->SetGpuInfo(gpu_info); | 394 GetContentClient()->SetGpuInfo(gpu_info); |
391 } | 395 } |
392 | 396 |
393 bool WarmUpSandbox(const base::CommandLine& command_line) { | 397 bool WarmUpSandbox(const base::CommandLine& command_line) { |
394 { | 398 { |
395 TRACE_EVENT0("gpu", "Warm up rand"); | 399 TRACE_EVENT0("gpu", "Warm up rand"); |
396 // Warm up the random subsystem, which needs to be done pre-sandbox on all | 400 // Warm up the random subsystem, which needs to be done pre-sandbox on all |
397 // platforms. | 401 // platforms. |
398 (void) base::RandUint64(); | 402 (void) base::RandUint64(); |
399 } | 403 } |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
531 return true; | 535 return true; |
532 } | 536 } |
533 | 537 |
534 return false; | 538 return false; |
535 } | 539 } |
536 #endif // defined(OS_WIN) | 540 #endif // defined(OS_WIN) |
537 | 541 |
538 } // namespace. | 542 } // namespace. |
539 | 543 |
540 } // namespace content | 544 } // namespace content |
OLD | NEW |