Moving SwiftShader from component to bundled library

ui/gl/init/gl_initializer_x11.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/init/gl_initializer.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "ui/gfx/switches.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_egl_api_implementation.h"
+#include "ui/gl/gl_features.h"
 #include "ui/gl/gl_gl_api_implementation.h"
 #include "ui/gl/gl_glx_api_implementation.h"
 #include "ui/gl/gl_implementation_osmesa.h"
 #include "ui/gl/gl_osmesa_api_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_surface_glx.h"
 #include "ui/gl/gl_surface_osmesa_x11.h"
 #include "ui/gl/gl_switches.h"
 
 namespace gl {
 namespace init {
 
 namespace {
 
 #if defined(OS_OPENBSD)
 const char kGLLibraryName[] = "libGL.so";
 #else
 const char kGLLibraryName[] = "libGL.so.1";
 #endif
 
 const char kGLESv2LibraryName[] = "libGLESv2.so.2";
 const char kEGLLibraryName[] = "libEGL.so.1";
 
 const char kGLESv2ANGLELibraryName[] = "libGLESv2.so";
 const char kEGLANGLELibraryName[] = "libEGL.so";
 
+#if BUILDFLAG(ENABLE_SWIFTSHADER)
 const char kGLESv2SwiftShaderLibraryName[] = "libGLESv2.so";
 const char kEGLSwiftShaderLibraryName[] = "libEGL.so";
+#endif
 
 bool InitializeStaticGLXInternal() {
   base::NativeLibrary library = NULL;
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kTestGLLib))
     library = LoadLibraryAndPrintError(
         command_line->GetSwitchValueASCII(switches::kTestGLLib).c_str());
 
@@ skipping 23 matching lines @@
 
   return true;
 }
 
 bool InitializeStaticEGLInternal() {
   base::FilePath glesv2_path(kGLESv2LibraryName);
   base::FilePath egl_path(kEGLLibraryName);
 
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
-  if (command_line->GetSwitchValueASCII(switches::kUseGL) ==
-      kGLImplementationANGLEName) {
+  const std::string use_gl =
+      command_line->GetSwitchValueASCII(switches::kUseGL);
+  if (use_gl == kGLImplementationANGLEName) {
     base::FilePath module_path;
     if (!PathService::Get(base::DIR_MODULE, &module_path))
       return false;
 
     glesv2_path = module_path.Append(kGLESv2ANGLELibraryName);
     egl_path = module_path.Append(kEGLANGLELibraryName);
-  } else if (command_line->GetSwitchValueASCII(switches::kUseGL) ==
-             kGLImplementationSwiftShaderName) {
+#if BUILDFLAG(ENABLE_SWIFTSHADER)
+  } else if ((use_gl == kGLImplementationSwiftShaderName) ||
+             (use_gl == kGLImplementationSwiftShaderForWebGLName)) {
     base::FilePath module_path;
-    if (!command_line->HasSwitch(switches::kSwiftShaderPath))
+    if (!PathService::Get(base::DIR_MODULE, &module_path))
       return false;
-    module_path = command_line->GetSwitchValuePath(switches::kSwiftShaderPath);
+    module_path = module_path.Append("swiftshader/");
 
     glesv2_path = module_path.Append(kGLESv2SwiftShaderLibraryName);
     egl_path = module_path.Append(kEGLSwiftShaderLibraryName);
+#endif
   }
 
   base::NativeLibrary gles_library = LoadLibraryAndPrintError(glesv2_path);
   if (!gles_library)
     return false;
   base::NativeLibrary egl_library = LoadLibraryAndPrintError(egl_path);
   if (!egl_library) {
     base::UnloadNativeLibrary(gles_library);
     return false;
   }
@@ skipping 95 matching lines @@
 void ShutdownGLPlatform() {
   GLSurfaceEGL::ShutdownOneOff();
   ClearBindingsEGL();
   ClearBindingsGL();
   ClearBindingsGLX();
   ClearBindingsOSMESA();
 }
 
 }  // namespace init
 }  // namespace gl