| Index: chrome/browser/gpu/chrome_gpu_util.cc
|
| diff --git a/chrome/browser/gpu/chrome_gpu_util.cc b/chrome/browser/gpu/chrome_gpu_util.cc
|
| index 73cca3e84b74b98aa98c96edfbf8086a4c823f55..441cebc31daa4b962ccce0a8b1dfb3f9928ad751 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(
|
|
|