diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 17:17:38 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 17:17:38 +0000 |
| commit | 7259e6e74961e63407553119107184a128f2aa45 (patch) | |
| tree | 1825531559a41c459c782ff9be1939a66e1088ab /content/shell | |
| parent | 06188609837d97a2438ad96931d3742ad3405cf1 (diff) | |
| download | chromium_src-7259e6e74961e63407553119107184a128f2aa45.zip chromium_src-7259e6e74961e63407553119107184a128f2aa45.tar.gz chromium_src-7259e6e74961e63407553119107184a128f2aa45.tar.bz2 | |
content_shell: Don't force-enable OSMesa for layout tests on Android
OSMesa is not yet supported by Android. Forcing this to be enabled causes
content_shell to fail in getting a valid GL context.
BUG=248925, 232044
Review URL: https://chromiumcodereview.appspot.com/16323006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/app/shell_main_delegate.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc index 42c5f4d..a1a2e78 100644 --- a/content/shell/app/shell_main_delegate.cc +++ b/content/shell/app/shell_main_delegate.cc @@ -117,8 +117,11 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { command_line.AppendSwitch(switches::kProcessPerTab); command_line.AppendSwitch(switches::kEnableLogging); command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); +#if !defined(OS_ANDROID) + // OSMesa is not yet available for Android. http://crbug.com/248925 command_line.AppendSwitchASCII( switches::kUseGL, gfx::kGLImplementationOSMesaName); +#endif command_line.AppendSwitch(switches::kSkipGpuDataLoading); command_line.AppendSwitch(switches::kDisableGpuVsync); command_line.AppendSwitch(switches::kEnableExperimentalWebKitFeatures); |