| Index: content/browser/gpu/compositor_util.cc
|
| diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc
|
| index 962821562851e53a68edb40a8c98b37c900ced3f..9e679b087512bf24d5d072dc128a213ce49858ef 100644
|
| --- a/content/browser/gpu/compositor_util.cc
|
| +++ b/content/browser/gpu/compositor_util.cc
|
| @@ -61,6 +61,12 @@ bool IsThreadedCompositingEnabled() {
|
| command_line.HasSwitch(switches::kDisableThreadedCompositing))
|
| return false;
|
|
|
| +#if defined(OS_CHROMEOS)
|
| + // We always want threaded compositing on ChromeOS unless it's explicitly
|
| + // disabled above.
|
| + return true;
|
| +#endif
|
| +
|
| if (command_line.HasSwitch(switches::kEnableThreadedCompositing))
|
| return true;
|
|
|
| @@ -88,6 +94,11 @@ bool IsForceCompositingModeEnabled() {
|
| if (command_line.HasSwitch(switches::kDisableForceCompositingMode))
|
| return false;
|
|
|
| +#if defined(OS_CHROMEOS)
|
| + // We always want compositing ChromeOS unless it's explicitly disabled above.
|
| + return true;
|
| +#endif
|
| +
|
| if (command_line.HasSwitch(switches::kForceCompositingMode))
|
| return true;
|
|
|
|
|