Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2211)

Unified Diff: content/shell/app/shell_main_delegate.cc

Issue 1644763002: Add virtual layout test for GPU accelerated decoding. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Skip desktop virtual tests Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index 4d47d23af167f2ffa89dff220ffdb5c213925939..82fa47a6c47744758856ded07268799eee9f3377 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -167,7 +167,8 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
command_line.AppendSwitch(switches::kEnableLogging);
command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
// only default to osmesa if the flag isn't already specified.
- if (!command_line.HasSwitch(switches::kUseGL)) {
+ if (!command_line.HasSwitch(switches::kUseGpuInTests) &&
+ !command_line.HasSwitch(switches::kUseGL)) {
command_line.AppendSwitchASCII(switches::kUseGL,
gl::kGLImplementationOSMesaName);
}
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | third_party/WebKit/LayoutTests/MSANExpectations » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698