diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-02 18:11:57 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-02 18:11:57 +0000 |
| commit | 9c2985a474815d0fd41b38c8ec418e15d34dc6a8 (patch) | |
| tree | 118cf02ad918718570eb07614719db8f5303bb32 /chrome/browser/gpu/gpu_feature_checker.cc | |
| parent | 398fa730d4d71fc5510fc93e0e832e239eecddfd (diff) | |
| download | chromium_src-9c2985a474815d0fd41b38c8ec418e15d34dc6a8.zip chromium_src-9c2985a474815d0fd41b38c8ec418e15d34dc6a8.tar.gz chromium_src-9c2985a474815d0fd41b38c8ec418e15d34dc6a8.tar.bz2 | |
Change GpuControlList features from bits of int to set.
Before, we limit to manage 32 features. Now we can manage as many as we want.
BUG=222857
TEST=content_unittests, waterfall
Review URL: https://codereview.chromium.org/13240002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu/gpu_feature_checker.cc')
| -rw-r--r-- | chrome/browser/gpu/gpu_feature_checker.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/gpu/gpu_feature_checker.cc b/chrome/browser/gpu/gpu_feature_checker.cc index 123cc49..23e0fb1 100644 --- a/chrome/browser/gpu/gpu_feature_checker.cc +++ b/chrome/browser/gpu/gpu_feature_checker.cc @@ -14,15 +14,8 @@ namespace { // GPU info has been collected in a GPU process. bool IsFeatureAllowed(content::GpuDataManager* manager, content::GpuFeatureType feature) { - bool feature_allowed = true; - if (!manager->GpuAccessAllowed()) { - feature_allowed = false; - } else { - uint32 blacklist_type = manager->GetBlacklistedFeatures(); - if (blacklist_type & feature) - feature_allowed = false; - } - return feature_allowed; + return (manager->GpuAccessAllowed() && + !manager->IsFeatureBlacklisted(feature)); } } // namespace |