diff options
| author | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 00:08:48 +0000 |
|---|---|---|
| committer | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 00:08:48 +0000 |
| commit | 9f8f2f47a66675152e9c7c3ec4d44be09fcd5567 (patch) | |
| tree | 1e95193624881a04f519758406116e141a6d4799 /content/browser/gpu | |
| parent | 7b15c0b9a17ea1be9a75ad6520044628cf589c05 (diff) | |
| download | chromium_src-9f8f2f47a66675152e9c7c3ec4d44be09fcd5567.zip chromium_src-9f8f2f47a66675152e9c7c3ec4d44be09fcd5567.tar.gz chromium_src-9f8f2f47a66675152e9c7c3ec4d44be09fcd5567.tar.bz2 | |
Restore the gpu blacklist logic.
The gpu blacklist is no longer applied due to a regression. I decided not to put this fix together with the rest of gpu blacklist logic regression recovering as this is more urgent and simple to fix.
BUG=83639
TEST=gpu blacklist is applied. if a gpu feature should be blacklisted, it will.
Review URL: http://codereview.chromium.org/7065012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/browser/gpu/gpu_data_manager.cc b/content/browser/gpu/gpu_data_manager.cc index 25d501d..d8cfe75 100644 --- a/content/browser/gpu/gpu_data_manager.cc +++ b/content/browser/gpu/gpu_data_manager.cc @@ -185,6 +185,12 @@ void GpuDataManager::UpdateGpuFeatureFlags() { return; } + { + base::AutoLock auto_lock(gpu_info_lock_); + gpu_feature_flags_ = gpu_blacklist->DetermineGpuFeatureFlags( + GpuBlacklist::kOsAny, NULL, gpu_info_); + } + uint32 max_entry_id = gpu_blacklist->max_entry_id(); if (!gpu_feature_flags_.flags()) { UMA_HISTOGRAM_ENUMERATION("GPU.BlacklistTestResultsPerEntry", |