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 | |
| 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
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 8 | ||||
| -rw-r--r-- | content/browser/gpu/compositor_util.cc | 11 | ||||
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl_private.cc | 4 |
3 files changed, 12 insertions, 11 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 diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc index 73af130..133ed5d 100644 --- a/content/browser/gpu/compositor_util.cc +++ b/content/browser/gpu/compositor_util.cc @@ -219,18 +219,19 @@ bool IsThreadedCompositingEnabled() { return true; } -#if defined(USE_AURA) - // We always want threaded compositing on Aura. +#if defined(USE_AURA) || defined(OS_MACOSX) + // We always want threaded compositing on Aura and Mac (the fallback is a + // threaded software compositor). return true; #endif if (!CanDoAcceleratedCompositing() || IsForceCompositingModeBlacklisted()) return false; -#if defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_WIN) // Windows Vista+ has been shipping with TCM enabled at 100% since M24 and - // Mac OSX 10.8+ since M28. The blacklist check above takes care of returning - // false before this hits on unsupported Win/Mac versions. + // The blacklist check above takes care of returning false before this hits + // on unsupported Win versions. return true; #endif diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc index 5eeeb7d..cfd96ca 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -971,8 +971,8 @@ GpuDataManagerImplPrivate::GpuDataManagerImplPrivate( DisableHardwareAcceleration(); if (command_line->HasSwitch(switches::kEnableSoftwareCompositing)) use_software_compositor_ = true; - //TODO(jbauman): enable for Chrome OS and Linux -#if defined(USE_AURA) && !defined(OS_CHROMEOS) + // TODO(jbauman): enable for Chrome OS +#if (defined(USE_AURA) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) use_software_compositor_ = true; #endif |