diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 08:44:03 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 08:44:03 +0000 |
| commit | 52a35d452b3b92310895aad727f3308712a02f45 (patch) | |
| tree | 9bfc2c9f94bc3a3bed1502b2ddbf4cd01b54dc34 /content/shell | |
| parent | ec2bc4e6bd6fe1d7ad7df79b320e9c5550a2b322 (diff) | |
| download | chromium_src-52a35d452b3b92310895aad727f3308712a02f45.zip chromium_src-52a35d452b3b92310895aad727f3308712a02f45.tar.gz chromium_src-52a35d452b3b92310895aad727f3308712a02f45.tar.bz2 | |
[content shell] Always use the osmesa driver for layout tests, and disable the gpu blacklist
BUG=111316
TEST=webgl tests pass
Review URL: https://codereview.chromium.org/11143009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_main_delegate.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc index ad1abcc..3a2532d 100644 --- a/content/shell/shell_main_delegate.cc +++ b/content/shell/shell_main_delegate.cc @@ -19,6 +19,7 @@ #include "net/cookies/cookie_monster.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "ui/gl/gl_switches.h" #if defined(OS_ANDROID) #include "base/global_descriptors_posix.h" @@ -91,6 +92,10 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { switches::kAllowFileAccessFromFiles); CommandLine::ForCurrentProcess()->AppendSwitch( switches::kForceCompositingMode); + CommandLine::ForCurrentProcess()->AppendSwitchASCII( + switches::kUseGL, gfx::kGLImplementationOSMesaName); + CommandLine::ForCurrentProcess()->AppendSwitch( + switches::kIgnoreGpuBlacklist); net::CookieMonster::EnableFileScheme(); if (!WebKitTestPlatformInitialize()) { if (exit_code) |