Commit 9f8f2f47 authored by zmo@google.com's avatar zmo@google.com

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
parent 7b15c0b9
......@@ -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",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment