Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(966)

Unified Diff: trunk/src/chrome/browser/gpu/chrome_gpu_util.cc

Issue 14527003: Revert 196933 "Turn on threaded compositing in OS X for continuo..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/gpu/chrome_gpu_util.cc
===================================================================
--- trunk/src/chrome/browser/gpu/chrome_gpu_util.cc (revision 196963)
+++ trunk/src/chrome/browser/gpu/chrome_gpu_util.cc (working copy)
@@ -112,9 +112,16 @@
// 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 Mac.
+#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(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698