From 3d49ce4871cca63a6cda09dae0bb82489cd6b081 Mon Sep 17 00:00:00 2001 From: "ccameron@chromium.org" Date: Sat, 27 Apr 2013 03:31:09 +0000 Subject: Turn on threaded compositing in OS X for continuous builds. BUG=172015 TBR=vangelis Review URL: https://chromiumcodereview.appspot.com/14520022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196933 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gpu/chrome_gpu_util.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/chrome/browser/gpu/chrome_gpu_util.cc b/chrome/browser/gpu/chrome_gpu_util.cc index 73cca3e..441cebc 100644 --- a/chrome/browser/gpu/chrome_gpu_util.cc +++ b/chrome/browser/gpu/chrome_gpu_util.cc @@ -112,16 +112,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 Mac. 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( -- cgit v1.1