Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/gpu/gpu_data_manager_impl_private.h" | 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 421 GpuProcessHost::SendOnIO( | 421 GpuProcessHost::SendOnIO( |
| 422 #if defined(OS_WIN) | 422 #if defined(OS_WIN) |
| 423 GpuProcessHost::GPU_PROCESS_KIND_UNSANDBOXED, | 423 GpuProcessHost::GPU_PROCESS_KIND_UNSANDBOXED, |
| 424 #else | 424 #else |
| 425 GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED, | 425 GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED, |
| 426 #endif | 426 #endif |
| 427 true /* force_create */, new GpuMsg_CollectGraphicsInfo()); | 427 true /* force_create */, new GpuMsg_CollectGraphicsInfo()); |
| 428 } | 428 } |
| 429 | 429 |
| 430 bool GpuDataManagerImplPrivate::IsEssentialGpuInfoAvailable() const { | 430 bool GpuDataManagerImplPrivate::IsEssentialGpuInfoAvailable() const { |
| 431 if (gpu_info_.basic_info_state == gpu::kCollectInfoNone || | 431 return (gpu_info_.basic_info_state != gpu::kCollectInfoNone && |
| 432 gpu_info_.context_info_state == gpu::kCollectInfoNone) { | 432 gpu_info_.context_info_state != gpu::kCollectInfoNone) || |
| 433 return false; | 433 use_swiftshader_; |
|
Ken Russell (switch to Gerrit)
2017/03/24 21:57:52
What does GpuDataManager::GetGPUInfo() return now
| |
| 434 } | |
| 435 return true; | |
| 436 } | 434 } |
| 437 | 435 |
| 438 bool GpuDataManagerImplPrivate::IsCompleteGpuInfoAvailable() const { | 436 bool GpuDataManagerImplPrivate::IsCompleteGpuInfoAvailable() const { |
| 439 #if defined(OS_WIN) | 437 #if defined(OS_WIN) |
| 440 if (gpu_info_.dx_diagnostics_info_state == gpu::kCollectInfoNone) | 438 if (gpu_info_.dx_diagnostics_info_state == gpu::kCollectInfoNone) |
| 441 return false; | 439 return false; |
| 442 #endif | 440 #endif |
| 443 return IsEssentialGpuInfoAvailable(); | 441 return IsEssentialGpuInfoAvailable(); |
| 444 } | 442 } |
| 445 | 443 |
| (...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1362 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1360 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
| 1363 #if defined(OS_WIN) | 1361 #if defined(OS_WIN) |
| 1364 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1362 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
| 1365 #endif | 1363 #endif |
| 1366 complete_gpu_info_already_requested_ = true; | 1364 complete_gpu_info_already_requested_ = true; |
| 1367 // Some observers might be waiting. | 1365 // Some observers might be waiting. |
| 1368 NotifyGpuInfoUpdate(); | 1366 NotifyGpuInfoUpdate(); |
| 1369 } | 1367 } |
| 1370 | 1368 |
| 1371 } // namespace content | 1369 } // namespace content |
| OLD | NEW |