diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 23:58:01 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 23:58:01 +0000 |
| commit | dc5fb16c7cb6cbde8bdf4a2c0ee5befbe64d990d (patch) | |
| tree | 4959c4dc33d092086db2402e4dd91ae24c7fc9cc /chrome/browser/gpu/chrome_gpu_util.cc | |
| parent | 5a869f475ab678cb1f64f65b13469468b6f803bd (diff) | |
| download | chromium_src-dc5fb16c7cb6cbde8bdf4a2c0ee5befbe64d990d.zip chromium_src-dc5fb16c7cb6cbde8bdf4a2c0ee5befbe64d990d.tar.gz chromium_src-dc5fb16c7cb6cbde8bdf4a2c0ee5befbe64d990d.tar.bz2 | |
Revert 181368, because of TabCaptureApiTest.EndToEnd crashes.
> Turn on threaded compositing in OSX for continuous builds
>
>
> BUG=172015
>
> Review URL: https://chromiumcodereview.appspot.com/12049060
TBR=vangelis@chromium.org
Review URL: https://codereview.chromium.org/12221080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu/chrome_gpu_util.cc')
| -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 bf236a1..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 and OSX. +#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( |