diff options
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 15 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 5 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 02f554d..d17b347 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -566,6 +566,21 @@ int ChromeMain(int argc, char** argv) { singleton_command_line->AppendSwitch(switches::kEnableGPUPlugin); } + // TODO(vangelis): Remove this block once accelerated compositing is enabled + // on all platforms. +#if defined(OS_MACOSX) + // Accelerated compositing is currently disabled by default on the mac, as it + // is less stable than other platforms. We disable it by adding a disable + // to the command line switches. Note that the rest of the code only checks + // for the disable flag, never for enable. + if (!parsed_command_line.HasSwitch( + switches::kEnableAcceleratedCompositing)) { + CommandLine* singleton_command_line = CommandLine::ForCurrentProcess(); + singleton_command_line->AppendSwitch( + switches::kDisableAcceleratedCompositing); + } +#endif + #if defined(OS_CHROMEOS) if (parsed_command_line.HasSwitch(switches::kBWSI)) { // Disable sync and extensions if we're in "browse without sign-in" mode. diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 74ef4ca..65b1d00 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -347,6 +347,11 @@ const char kDumpHistogramsOnExit[] = "dump-histograms-on-exit"; // Enable displaying net log events on the command line. extern const char kLogNetLog[] = "log-net-log"; +// Enable gpu-accelerated compositing. +// TODO(vangelis): Remove the flag once accelerated compositing is enabled by +// default on all platforms. +const char kEnableAcceleratedCompositing[] = "enable-accelerated-compositing"; + // Enable gpu-accelerated 2d canvas. const char kEnableAccelerated2dCanvas[] = "enable-accelerated-2d-canvas"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 82417c4..f47a609 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -111,6 +111,7 @@ extern const char kDnsPrefetchDisable[]; extern const char kDomAutomationController[]; extern const char kDumpHistogramsOnExit[]; extern const char kEnableAccelerated2dCanvas[]; +extern const char kEnableAcceleratedCompositing[]; extern const char kEnableAeroPeekTabs[]; extern const char kEnableAuthNegotiatePort[]; extern const char kEnableBackgroundMode[]; |