Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / gl / gl_surface.cc

diff --git a/src/ui/gl/gl_surface.cc b/src/ui/gl/gl_surface.cc
index 4e74f49..92b2b45 100644 (file)
--- a/src/ui/gl/gl_surface.cc
+++ b/src/ui/gl/gl_surface.cc
@@ -42,7 +42,9 @@ bool GLSurface::InitializeOneOff() {
   // The default implementation is always the first one in list.
   GLImplementation impl = allowed_impls[0];
   bool fallback_to_osmesa = false;
-  if (cmd->HasSwitch(switches::kUseGL)) {
+  if (cmd->HasSwitch(switches::kOverrideUseGLWithOSMesaForTests)) {
+    impl = kGLImplementationOSMesaGL;
+  } else if (cmd->HasSwitch(switches::kUseGL)) {
     std::string requested_implementation_name =
         cmd->GetSwitchValueASCII(switches::kUseGL);
     if (requested_implementation_name == "any") {