diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 13:57:32 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 13:57:32 +0000 |
| commit | f5b7f6eaf180ec9b0b8a8536a9bcd731ca1031b1 (patch) | |
| tree | 93a05fe890000b91f53a624ea50dc827f796959b /gpu | |
| parent | 99c35445cc8a9ee68d2a9c1bc084d222ca2aa29c (diff) | |
| download | chromium_src-f5b7f6eaf180ec9b0b8a8536a9bcd731ca1031b1.zip chromium_src-f5b7f6eaf180ec9b0b8a8536a9bcd731ca1031b1.tar.gz chromium_src-f5b7f6eaf180ec9b0b8a8536a9bcd731ca1031b1.tar.bz2 | |
Tighten the blacklist on VMWare on OS X
There will no such thing as blacklisting just FCM in the future, so
first we will change these configurations to disable everything (so
they'll be like WinXP should be).
Fix up a number of tests that don't work when there is no GPU
process. It's not clear how these tests work on WinXP, so add a
temporary log statement in one of these tests so we can figure
out why they are passing on WinXP (they do not pass locally when
the GPU is blacklisted).
BUG=286038
Review URL: https://codereview.chromium.org/107093006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/config/gpu_test_config.cc | 16 | ||||
| -rw-r--r-- | gpu/config/gpu_test_config.h | 3 | ||||
| -rw-r--r-- | gpu/config/software_rendering_list_json.cc | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/gpu/config/gpu_test_config.cc b/gpu/config/gpu_test_config.cc index ffb6e5f..d99f71d 100644 --- a/gpu/config/gpu_test_config.cc +++ b/gpu/config/gpu_test_config.cc @@ -10,6 +10,10 @@ #include "gpu/config/gpu_info_collector.h" #include "gpu/config/gpu_test_expectations_parser.h" +#if defined(OS_MACOSX) +#include "base/mac/mac_util.h" +#endif + namespace gpu { namespace { @@ -268,5 +272,17 @@ bool GPUTestBotConfig::CurrentConfigMatches( return false; } +// static +bool GPUTestBotConfig::GpuBlacklistedOnBot() { +#if defined(OS_MACOSX) + // Blacklist rule #81 disables all Gpu acceleration on Mac < 10.8 bots. + if (CurrentConfigMatches("MAC VMWARE") && base::mac::IsOSLionOrEarlier()) { + return true; + } +#endif + // TODO(ccameron): This should be true on Windows XP as well. + return false; +} + } // namespace gpu diff --git a/gpu/config/gpu_test_config.h b/gpu/config/gpu_test_config.h index 3c7b038..2b0db4c 100644 --- a/gpu/config/gpu_test_config.h +++ b/gpu/config/gpu_test_config.h @@ -116,6 +116,9 @@ class GPU_EXPORT GPUTestBotConfig : public GPUTestConfig { // Check if this bot's config matches |config_data| or any of the |configs|. static bool CurrentConfigMatches(const std::string& config_data); static bool CurrentConfigMatches(const std::vector<std::string>& configs); + + // Check if the bot has blacklisted all GPU features. + static bool GpuBlacklistedOnBot(); }; } // namespace gpu diff --git a/gpu/config/software_rendering_list_json.cc b/gpu/config/software_rendering_list_json.cc index 262649c..08d100f 100644 --- a/gpu/config/software_rendering_list_json.cc +++ b/gpu/config/software_rendering_list_json.cc @@ -954,7 +954,7 @@ LONG_STRING_CONST( }, "vendor_id": "0x15ad", "features": [ - "force_compositing_mode" + "all" ] }, { |