summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 19:23:13 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 19:23:13 +0000
commit52bf13415a1e4703d84aa703d2e125cd7c51b974 (patch)
tree9f8282a1bfbfa7de5952573bb30783605ffa396b
parent5007eb233a2a78a35361e27d9a9c9ae439a01ba4 (diff)
downloadchromium_src-52bf13415a1e4703d84aa703d2e125cd7c51b974.zip
chromium_src-52bf13415a1e4703d84aa703d2e125cd7c51b974.tar.gz
chromium_src-52bf13415a1e4703d84aa703d2e125cd7c51b974.tar.bz2
ARM build fix.
On ARM without libpci, vendor_id and device_id will return 0, and we should not disable GPU features because of this. BUG= TEST=ARM bots TBR=sheu Review URL: https://chromiumcodereview.appspot.com/10406011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137480 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/gpu/gpu_data_manager_impl.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
index 06201a8..8e88dc7 100644
--- a/content/browser/gpu/gpu_data_manager_impl.cc
+++ b/content/browser/gpu/gpu_data_manager_impl.cc
@@ -90,12 +90,10 @@ 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) {
+ if (gpu_info.gpu.vendor_id && gpu_info.gpu.device_id)
gpu_info_ = gpu_info;
- } else {
- gpu_info_.gpu_accessible = false;
+ else
gpu_info_.finalized = true;
- }
complete_gpu_info_available_ =
complete_gpu_info_available_ || gpu_info_.finalized;
complete_gpu_info_already_requested_ =