diff options
-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( |