diff options
| author | skyostil@google.com <skyostil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 11:38:51 +0000 |
|---|---|---|
| committer | skyostil@google.com <skyostil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 11:38:51 +0000 |
| commit | 9834372e712aab2753fa453efe09d3f230acaa2f (patch) | |
| tree | f2a627f4c865b69e1b66d98b37aeb8f42ebd0c81 | |
| parent | 4111a25fa76df737927f10d9fa30095a8020cc40 (diff) | |
| download | chromium_src-9834372e712aab2753fa453efe09d3f230acaa2f.zip chromium_src-9834372e712aab2753fa453efe09d3f230acaa2f.tar.gz chromium_src-9834372e712aab2753fa453efe09d3f230acaa2f.tar.bz2 | |
Don't throw away GPU data on non-PCI architectures
GpuDataManagerImpl checks whether we know the GPU's PCI vendor and
device id. If not, the collected GPU data is thrown away and is not
shown in about:gpu. Since most non-x86 architectures are also non-PCI,
only do this check on the x86 family.
BUG=130013
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10456005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139523 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc index 076cec6..bd0b069 100644 --- a/content/browser/gpu/gpu_data_manager_impl.cc +++ b/content/browser/gpu/gpu_data_manager_impl.cc @@ -90,10 +90,12 @@ void GpuDataManagerImpl::UpdateGpuInfo(const content::GPUInfo& gpu_info) { { base::AutoLock auto_lock(gpu_info_lock_); - if (gpu_info.gpu.vendor_id && gpu_info.gpu.device_id) - gpu_info_ = gpu_info; - else +#if defined(ARCH_CPU_X86_FAMILY) + if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id) gpu_info_.finalized = true; + else +#endif + gpu_info_ = gpu_info; complete_gpu_info_available_ = complete_gpu_info_available_ || gpu_info_.finalized; complete_gpu_info_already_requested_ = |