diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-27 09:16:45 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-27 09:16:45 +0000 |
| commit | dbadfc69982012c97932715e9c7d43de4a425e01 (patch) | |
| tree | 2477890ef4709254dd381306cd1a2ea238a6343e /chrome/browser/gpu | |
| parent | a472e96c2679aaa11b971c2de4c2a79fd2446c63 (diff) | |
| download | chromium_src-dbadfc69982012c97932715e9c7d43de4a425e01.zip chromium_src-dbadfc69982012c97932715e9c7d43de4a425e01.tar.gz chromium_src-dbadfc69982012c97932715e9c7d43de4a425e01.tar.bz2 | |
Revert 196933 "Turn on threaded compositing in OS X for continuo..."
> Turn on threaded compositing in OS X for continuous builds.
>
> BUG=172015
> TBR=vangelis
>
> Review URL: https://chromiumcodereview.appspot.com/14520022
TBR=ccameron@chromium.org
Review URL: https://codereview.chromium.org/14527003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu')
| -rw-r--r-- | chrome/browser/gpu/chrome_gpu_util.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/gpu/chrome_gpu_util.cc b/chrome/browser/gpu/chrome_gpu_util.cc index 441cebc..73cca3e 100644 --- a/chrome/browser/gpu/chrome_gpu_util.cc +++ b/chrome/browser/gpu/chrome_gpu_util.cc @@ -112,9 +112,16 @@ void InitializeCompositingFieldTrial() { // http://crbug.com/133602 for mac // http://crbug.com/140866 for linux -#if defined(OS_WIN) || defined(OS_MACOSX) - // Enable threaded compositing on Windows and Mac. +#if defined(OS_WIN) + // Enable threaded compositing on Windows. 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( |