diff options
| author | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 22:08:09 +0000 |
|---|---|---|
| committer | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 22:08:09 +0000 |
| commit | a09a58dab96bc110dc47533a48d2691ce19738c6 (patch) | |
| tree | 7c4473e78bdd41def1d1777c90da03200b711f28 /chrome/browser | |
| parent | 83da721a31f09965bb12020a78334a3eaba8b618 (diff) | |
| download | chromium_src-a09a58dab96bc110dc47533a48d2691ce19738c6.zip chromium_src-a09a58dab96bc110dc47533a48d2691ce19738c6.tar.gz chromium_src-a09a58dab96bc110dc47533a48d2691ce19738c6.tar.bz2 | |
Turn on threaded compositing in OSX for continuous builds
BUG=172015
Review URL: https://chromiumcodereview.appspot.com/12049060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/gpu/chrome_gpu_util.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/gpu/chrome_gpu_util.cc b/chrome/browser/gpu/chrome_gpu_util.cc index fccdc45..bf236a1 100644 --- a/chrome/browser/gpu/chrome_gpu_util.cc +++ b/chrome/browser/gpu/chrome_gpu_util.cc @@ -156,16 +156,9 @@ void InitializeCompositingFieldTrial() { // http://crbug.com/133602 for mac // http://crbug.com/140866 for linux -#if defined(OS_WIN) - // Enable threaded compositing on Windows. +#if defined(OS_WIN) || defined(OS_MACOSX) + // Enable threaded compositing on Windows and OSX. threaded_compositing_probability = kDivisor; -#elif defined(OS_MACOSX) - chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); - if (channel == chrome::VersionInfo::CHANNEL_CANARY || - channel == chrome::VersionInfo::CHANNEL_DEV) { - // Enable force-compositing-mode on the Mac. - force_compositing_mode_probability = kDivisor; - } #endif int force_compositing_group = trial->AppendGroup( |