diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 04:00:01 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 04:00:01 +0000 |
| commit | 87517dd1a3f71955392787cd7508f37059e39b93 (patch) | |
| tree | d90a726dc42d6f6d1c0225b62ec391a5f09e17b5 /gpu/config | |
| parent | 34ea1996ba4539997bb7eb3e7964697f69ebee6b (diff) | |
| download | chromium_src-87517dd1a3f71955392787cd7508f37059e39b93.zip chromium_src-87517dd1a3f71955392787cd7508f37059e39b93.tar.gz chromium_src-87517dd1a3f71955392787cd7508f37059e39b93.tar.bz2 | |
Enforce FCM settings via the blacklist rather than in-code version checks.
As of http://crrev.com/228816 both Win and Mac bots are properly using the blacklist and version checks in compositor_util.cc are no longer required.
Also cleanup the blacklist to:
1) Put Vista and XP blacklisting of FCM under the same rule.
2) Always blacklist Stage3D when FCM is disabled (as in https://codereview.chromium.org/25602002).
This is part of https://codereview.chromium.org/22198004/ which was split out into smaller chunks (now a follow-up to https://codereview.chromium.org/23703017/).
BUG=302738, 233830, 306557
Review URL: https://codereview.chromium.org/27197009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/config')
| -rw-r--r-- | gpu/config/software_rendering_list_json.cc | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc index a454ded..19a05ac 100644 --- a/gpu/config/software_rendering_list_json.cc +++ b/gpu/config/software_rendering_list_json.cc @@ -930,23 +930,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST( ] }, { - "id": 65, - "description": "Force compositing mode is unstable in Win Vista.", - "cr_bugs": [170421], - "os": { - "type": "win", - "version": { - "op": "=", - "value": "6.0" - } - }, - "features": [ - "flash_3d", - "flash_stage3d", - "force_compositing_mode" - ] - }, - { "id": 66, "description": "Force compositing mode is unstable in MacOSX earlier than 10.8.", "cr_bugs": [174101], @@ -1157,16 +1140,18 @@ LONG_STRING_CONST( }, { "id": 79, - "description": "Disable force compositing mode on all Windows versions prior to Vista.", - "cr_bugs": [273920], + "description": "Disable force compositing mode on all Windows versions prior to and including Vista.", + "cr_bugs": [273920, 170421], "os": { "type": "win", "version": { - "op": "<", + "op": "<=", "value": "6.0" } }, "features": [ + "flash_3d", + "flash_stage3d", "force_compositing_mode" ] } |