diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 00:13:21 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 00:13:21 +0000 |
| commit | c7c47ee3abb2e060294075d19cb92f3b9c0bb8f7 (patch) | |
| tree | a3d06d03e179135ab1154a3f18cd3cd037801323 /chrome/browser/gpu | |
| parent | 46cdfc0c5c52aef8ec9b9135af16c4778bb6b58c (diff) | |
| download | chromium_src-c7c47ee3abb2e060294075d19cb92f3b9c0bb8f7.zip chromium_src-c7c47ee3abb2e060294075d19cb92f3b9c0bb8f7.tar.gz chromium_src-c7c47ee3abb2e060294075d19cb92f3b9c0bb8f7.tar.bz2 | |
Revert 224810 "Enable GPU control lists in tests."
AcceleratedCompositingBlockedTest.AcceleratedCompositingBlocked fails repeatedly
on Mac ASAN: http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%20Tests%20%281%29/builds/14941/steps/browser_tests/logs/stdio
Also, it may be related to the OutOfProcessPPAPITest.Graphics3D failure: http://build.chromium.org/p/chromium.win/builders/Vista%20Tests%20%281%29/builds/40687/steps/browser_tests/logs/stdio
> Enable GPU control lists in tests.
>
> Reland of https://codereview.chromium.org/23534006/ (see that and the bug for more details).
>
> Also adding INFO-level logging to spell out each control list rule being applied on the bots (makes debugging and understanding failures much easier).
>
> R=piman@chromium.org
> TBR=jcivelli, piman, zmo
> BUG=295799
>
> Review URL: https://codereview.chromium.org/23703017
TBR=gab@chromium.org
Review URL: https://codereview.chromium.org/24165007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu')
| -rw-r--r-- | chrome/browser/gpu/chrome_gpu_util.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/chrome/browser/gpu/chrome_gpu_util.cc b/chrome/browser/gpu/chrome_gpu_util.cc index 5904713..61da773 100644 --- a/chrome/browser/gpu/chrome_gpu_util.cc +++ b/chrome/browser/gpu/chrome_gpu_util.cc @@ -46,6 +46,26 @@ bool ShouldRunCompositingFieldTrial() { return false; #endif +#if defined(OS_WIN) + // Don't run the trial on Windows XP. + if (base::win::GetVersion() < base::win::VERSION_VISTA) + return false; +#endif + +#if defined(OS_MACOSX) + // Browser and content shell tests hang on 10.7 when the Apple software + // renderer is used. These tests ignore the blacklist (which disables + // compositing both on 10.7 and when the Apple software renderer is used) + // by specifying the kSkipGpuDataLoading switch, so disable forced + // compositing here based on the switch and OS version. + // http://crbug.com/230931 + if (base::mac::IsOSLion() && + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kSkipGpuDataLoading)) { + return false; + } +#endif + // Don't activate the field trial if force-compositing-mode has been // explicitly disabled from the command line. if (CommandLine::ForCurrentProcess()->HasSwitch( |