diff options
| author | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 08:04:35 +0000 |
|---|---|---|
| committer | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 08:04:35 +0000 |
| commit | 959d66280d608a8a787807083bb985711b17bcb9 (patch) | |
| tree | 82e25cca286855a888f7fbf5b2f6b952c4052f90 /chrome/app | |
| parent | c942c8481be6e4dd1152813f6706e34ce67bc740 (diff) | |
| download | chromium_src-959d66280d608a8a787807083bb985711b17bcb9.zip chromium_src-959d66280d608a8a787807083bb985711b17bcb9.tar.gz chromium_src-959d66280d608a8a787807083bb985711b17bcb9.tar.bz2 | |
Build failure fix: Disabling accelerated compositing on the mac as it fails media related
UI tests on 10.5 . This failure was introduced in r58792.
TBR=kbr@google.com
Review URL: http://codereview.chromium.org/3336014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 15 |
1 files changed, 15 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. |