diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 22:15:12 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 22:15:12 +0000 |
| commit | df4ad51f02bb6509b38a2e625402acc70abc30f7 (patch) | |
| tree | 0f8abe757a96ee9f1ac02426c6bac34891cfbb73 /chrome/browser | |
| parent | 319b944a6e684d26f800c577d722bd87e23ea34d (diff) | |
| download | chromium_src-df4ad51f02bb6509b38a2e625402acc70abc30f7.zip chromium_src-df4ad51f02bb6509b38a2e625402acc70abc30f7.tar.gz chromium_src-df4ad51f02bb6509b38a2e625402acc70abc30f7.tar.bz2 | |
Turn on threaded compositing on Mac.
BUG=172015
TBR=vangelis
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/14740019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/gpu/chrome_gpu_util.cc | 11 |
1 files 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( |