Moving SwiftShader from component to bundled library

ui/gl/init/gl_initializer_win.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 <dwmapi.h>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 83 matching lines @@
   // are loaded before ANGLE is loaded in case they are not in the default
   // search path.
   LoadD3DXLibrary(module_path, kD3DCompiler);
 
   base::FilePath gles_path;
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   const std::string use_gl =
       command_line->GetSwitchValueASCII(switches::kUseGL);
   bool using_swift_shader =
+#if BUILDFLAG(ENABLE_SWIFTSHADER)
       (use_gl == kGLImplementationSwiftShaderName) ||

[jbauman, 2017/02/23 04:30:45]

This should return false if !BUILDFLAG(ENABLE_SWIFTSHADER) and
using_swift_shader is true. Otherwise the browser process could think it's using
swiftshader and the gpu process would ignore that and use D3D.

[sugoi, 2017/02/28 16:45:09]

Done.

       (use_gl == kGLImplementationSwiftShaderForWebGLName);
+#else
+      false;
+#endif
   if (using_swift_shader) {
-    if (!command_line->HasSwitch(switches::kSwiftShaderPath))
-      return false;
-    gles_path = command_line->GetSwitchValuePath(switches::kSwiftShaderPath);
+    gles_path = module_path.Append(L"swiftshader/");
     // Preload library
     LoadLibrary(L"ddraw.dll");
   } else {
     gles_path = module_path;
   }
 
   // Load libglesv2.dll before libegl.dll because the latter is dependent on
   // the former and if there is another version of libglesv2.dll in the dll
   // search path, it will get loaded instead.
   base::NativeLibrary gles_library =
@@ skipping 183 matching lines @@
 void ShutdownGLPlatform() {
   GLSurfaceEGL::ShutdownOneOff();
   ClearBindingsEGL();
   ClearBindingsGL();
   ClearBindingsOSMESA();
   ClearBindingsWGL();
 }
 
 }  // namespace init
 }  // namespace gl