diff options
| author | vangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 17:51:41 +0000 |
|---|---|---|
| committer | vangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 17:51:41 +0000 |
| commit | 5bde6ee2ad44220fcb40fec5a19c637c94ddfac6 (patch) | |
| tree | 97ed7e588fcf8d72a6f3b3c882a677a9fcc2c792 | |
| parent | 099df81cf02e6360c624de6af5073a40e9bf010b (diff) | |
| download | chromium_src-5bde6ee2ad44220fcb40fec5a19c637c94ddfac6.zip chromium_src-5bde6ee2ad44220fcb40fec5a19c637c94ddfac6.tar.gz chromium_src-5bde6ee2ad44220fcb40fec5a19c637c94ddfac6.tar.bz2 | |
Enable threaded compositing on windows by default
BUG=143809
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/11364180
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167695 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chrome_gpu_util.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chrome_gpu_util.cc b/chrome/browser/chrome_gpu_util.cc index 255a1f6..55b3062 100644 --- a/chrome/browser/chrome_gpu_util.cc +++ b/chrome/browser/chrome_gpu_util.cc @@ -156,18 +156,18 @@ void InitializeCompositingFieldTrial() { // http://crbug.com/133602 for mac // http://crbug.com/140866 for linux +#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 || channel == chrome::VersionInfo::CHANNEL_BETA) { -#if defined(OS_WIN) - // Enable threaded compositing on Windows. - threaded_compositing_probability = kDivisor; -#elif defined(OS_MACOSX) // Enable force-compositing-mode on the Mac. force_compositing_mode_probability = kDivisor; -#endif } +#endif int force_compositing_group = trial->AppendGroup( content::kGpuCompositingFieldTrialForceCompositingEnabledName, |