diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-29 21:22:30 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-29 21:22:30 +0000 |
| commit | 936a61c9be17dc3d01f5a3f95aef11646485745f (patch) | |
| tree | e04f10504df3c8209c23ae031642a8c89e444991 /gpu/config/gpu_control_list.cc | |
| parent | ebe261c4b3f5f28fd55dc53e156c04156e3607fa (diff) | |
| download | chromium_src-936a61c9be17dc3d01f5a3f95aef11646485745f.zip chromium_src-936a61c9be17dc3d01f5a3f95aef11646485745f.tar.gz chromium_src-936a61c9be17dc3d01f5a3f95aef11646485745f.tar.bz2 | |
Missing machine model info should be a no match for GPU blacklist
BUG=368006
TEST=gpu_unittests, on win/linux, gpu_rasterization is off
R=kbr@chromium.org
Review URL: https://codereview.chromium.org/253883006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/config/gpu_control_list.cc')
| -rw-r--r-- | gpu/config/gpu_control_list.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc index b5e37c7..30593ed 100644 --- a/gpu/config/gpu_control_list.cc +++ b/gpu/config/gpu_control_list.cc @@ -1121,8 +1121,9 @@ bool GpuControlList::GpuControlListEntry::Contains( (gpu_info.performance_stats.overall == 0.0 || !perf_overall_info_->Contains(gpu_info.performance_stats.overall))) return false; - if (!machine_model_name_list_.empty() && - !gpu_info.machine_model_name.empty()) { + if (!machine_model_name_list_.empty()) { + if (gpu_info.machine_model_name.empty()) + return false; bool found_match = false; for (size_t ii = 0; ii < machine_model_name_list_.size(); ++ii) { if (machine_model_name_list_[ii] == gpu_info.machine_model_name) { @@ -1134,8 +1135,8 @@ bool GpuControlList::GpuControlListEntry::Contains( return false; } if (machine_model_version_info_.get() != NULL && - !gpu_info.machine_model_version.empty() && - !machine_model_version_info_->Contains(gpu_info.machine_model_version)) + (gpu_info.machine_model_version.empty() || + !machine_model_version_info_->Contains(gpu_info.machine_model_version))) return false; if (gpu_count_info_.get() != NULL && !gpu_count_info_->Contains(gpu_info.secondary_gpus.size() + 1)) |