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

Unified Diff: content/shell/shell_main_delegate.cc

Issue 11143009: [content shell] Always use the osmesa driver for layout tests, and disable the gpu blacklist (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_main_delegate.cc
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc
index 97ad101dfcc338755a49c11b7189ffcde1b257bf..ea8a4844349608838047a15a71ffb6152985109c 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"
@@ -93,6 +94,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)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698