From dcbcd1523126ef6e0224c361e8523ad85277b8ee Mon Sep 17 00:00:00 2001 From: "vangelis@google.com" Date: Thu, 6 Dec 2012 17:35:08 +0000 Subject: [PATCH] Revert 168912 > Turn off FCM on the mac in canary to see if that will bring down the GPU OOM > crash rate. > > BUG=158469,146861 > TBR=thakis@chromium.org > > Review URL: https://codereview.chromium.org/11417096 TBR=vangelis@google.com Review URL: https://codereview.chromium.org/11469004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171519 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chrome_gpu_util.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chrome/browser/chrome_gpu_util.cc b/chrome/browser/chrome_gpu_util.cc index 3ac35b60762b..55b3062c2945 100644 --- a/chrome/browser/chrome_gpu_util.cc +++ b/chrome/browser/chrome_gpu_util.cc @@ -161,7 +161,8 @@ void InitializeCompositingFieldTrial() { threaded_compositing_probability = kDivisor; #elif defined(OS_MACOSX) chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); - if (channel == chrome::VersionInfo::CHANNEL_DEV || + if (channel == chrome::VersionInfo::CHANNEL_CANARY || + channel == chrome::VersionInfo::CHANNEL_DEV || channel == chrome::VersionInfo::CHANNEL_BETA) { // Enable force-compositing-mode on the Mac. force_compositing_mode_probability = kDivisor; -- 2.11.4.GIT