From 3b22093c5ea7fd343be8d40f6e229ca7e4eaef8c Mon Sep 17 00:00:00 2001 From: "ccameron@chromium.org" Date: Tue, 12 Feb 2013 02:07:07 +0000 Subject: Turn on threaded compositing in OSX for continuous builds. BUG=172015 TBR=vangelis Review URL: https://codereview.chromium.org/12223055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181821 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gpu/chrome_gpu_util.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/gpu/chrome_gpu_util.cc b/chrome/browser/gpu/chrome_gpu_util.cc index fccdc45..8dda42e 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) +#if defined(OS_WIN) || defined(OS_MACOSX) // 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( -- cgit v1.1