diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 06:20:05 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 06:20:05 +0000 |
| commit | 1f1dde8e92b7be25aa5eec4238b2fa1212b86598 (patch) | |
| tree | 40a9464bcd88caed8571df1b62b0bf1f2b85282d /chrome/test/gpu | |
| parent | 04703443e370690e52afcfaa63b90da6401276ea (diff) | |
| download | chromium_src-1f1dde8e92b7be25aa5eec4238b2fa1212b86598.zip chromium_src-1f1dde8e92b7be25aa5eec4238b2fa1212b86598.tar.gz chromium_src-1f1dde8e92b7be25aa5eec4238b2fa1212b86598.tar.bz2 | |
Enable software compositing on Mac
Disable accelerated compositing test to match Aura behavior.
Change task manager tests to disable the GPU instead of turning
off accelerated compositing (as this doesn't have meaning in the
software composited world).
BUG=286038
Review URL: https://codereview.chromium.org/102333003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index d20357e..72f1327 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -210,8 +210,8 @@ class AcceleratedCompositingBlockedTest : public GpuFeatureTest { } }; -#if defined(USE_AURA) -// Compositing is always on for Aura. +#if defined(USE_AURA) || defined(OS_MACOSX) +// Compositing is always on for Aura and Mac. #define MAYBE_AcceleratedCompositingBlocked DISABLED_AcceleratedCompositingBlocked #else #define MAYBE_AcceleratedCompositingBlocked AcceleratedCompositingBlocked @@ -234,8 +234,8 @@ class AcceleratedCompositingTest : public GpuFeatureTest { } }; -#if defined(USE_AURA) -// Compositing is always on for Aura. +#if defined(USE_AURA) || defined(OS_MACOSX) +// Compositing is always on for Aura and Mac. #define MAYBE_AcceleratedCompositingDisabled DISABLED_AcceleratedCompositingDisabled #else #define MAYBE_AcceleratedCompositingDisabled AcceleratedCompositingDisabled |