summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gpu
diff options
context:
space:
mode:
authorccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-05 21:48:56 +0000
committerccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-05 21:48:56 +0000
commita4c3a2dd814d6ced40d0d28392020df3bd3f2c1d (patch)
treeaa1c8d45bd5c5c29e6aa7dcdd23255413856fbce /chrome/browser/gpu
parent42dae12e9818f201d03339ee7212d95519a65af5 (diff)
downloadchromium_src-a4c3a2dd814d6ced40d0d28392020df3bd3f2c1d.zip
chromium_src-a4c3a2dd814d6ced40d0d28392020df3bd3f2c1d.tar.gz
chromium_src-a4c3a2dd814d6ced40d0d28392020df3bd3f2c1d.tar.bz2
Disable threaded compositing, but leave force compositing
enabled. BUG=172015 TBR=tonyg Review URL: https://codereview.chromium.org/12482002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu')
-rw-r--r--chrome/browser/gpu/chrome_gpu_util.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/gpu/chrome_gpu_util.cc b/chrome/browser/gpu/chrome_gpu_util.cc
index 38339b9..9fb7218 100644
--- a/chrome/browser/gpu/chrome_gpu_util.cc
+++ b/chrome/browser/gpu/chrome_gpu_util.cc
@@ -156,9 +156,12 @@ void InitializeCompositingFieldTrial() {
// http://crbug.com/133602 for mac
// http://crbug.com/140866 for linux
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if defined(OS_WIN)
// Enable threaded compositing on Windows.
threaded_compositing_probability = kDivisor;
+#elif defined(OS_MACOSX)
+ // Enable force compositing mode on Mac.
+ force_compositing_mode_probability = kDivisor;
#endif
int force_compositing_group = trial->AppendGroup(