diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-06 13:17:05 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-06 13:17:05 +0000 |
| commit | 5c70ff67b3e33089bdcc73539859ba4915c8d262 (patch) | |
| tree | 2e9ab756e2b93c886b52004bad6b705528ce73db /chrome/browser/gpu | |
| parent | 0ca5a27a07885fffc80541dfa982af61a8b7ade0 (diff) | |
| download | chromium_src-5c70ff67b3e33089bdcc73539859ba4915c8d262.zip chromium_src-5c70ff67b3e33089bdcc73539859ba4915c8d262.tar.gz chromium_src-5c70ff67b3e33089bdcc73539859ba4915c8d262.tar.bz2 | |
Disable threaded compositing on Mac.
BUG=172015
TBR=vangelis
Review URL: https://chromiumcodereview.appspot.com/12507004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186420 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 38339b9..fccdc45 100644 --- a/chrome/browser/gpu/chrome_gpu_util.cc +++ b/chrome/browser/gpu/chrome_gpu_util.cc @@ -156,9 +156,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. +#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( |