Reland of ui/gl: Initialize the ANGLE Platform on all configurations

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"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/windows_version.h"
-// TODO(jmadill): Apply to all platforms eventually
-#include "ui/gl/angle_platform_impl.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_osmesa_api_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_surface_wgl.h"
 #include "ui/gl/gl_wgl_api_implementation.h"
 #include "ui/gl/vsync_provider_win.h"
 
 namespace gl {
 namespace init {
 
 namespace {
 
 const wchar_t kD3DCompiler[] = L"D3DCompiler_47.dll";
 
-// TODO(jmadill): Apply to all platforms eventually
-base::LazyInstance<ANGLEPlatformImpl> g_angle_platform_impl =
-    LAZY_INSTANCE_INITIALIZER;
-
-ANGLEPlatformShutdownFunc g_angle_platform_shutdown = nullptr;
-
 bool LoadD3DXLibrary(const base::FilePath& module_path,
                      const base::FilePath::StringType& name) {
   base::NativeLibrary library =
       base::LoadNativeLibrary(base::FilePath(name), nullptr);
   if (!library) {
     library = base::LoadNativeLibrary(module_path.Append(name), nullptr);
     if (!library) {
       DVLOG(1) << name << " not found.";
       return false;
     }
@@ skipping 88 matching lines @@
     // Register key so that SwiftShader doesn't display watermark logo.
     typedef void (__stdcall *RegisterFunc)(const char* key);
     RegisterFunc reg = reinterpret_cast<RegisterFunc>(
       base::GetFunctionPointerFromNativeLibrary(gles_library, "Register"));
     if (reg) {
       reg("SS3GCKK6B448CF63");
     }
   }
 #endif
 
-  if (!using_swift_shader) {
-    // Init ANGLE platform here, before we call GetPlatformDisplay().
-    // TODO(jmadill): Apply to all platforms eventually
-    ANGLEPlatformInitializeFunc angle_platform_init =
-        reinterpret_cast<ANGLEPlatformInitializeFunc>(
-            base::GetFunctionPointerFromNativeLibrary(
-                gles_library, "ANGLEPlatformInitialize"));
-    if (angle_platform_init) {
-      angle_platform_init(&g_angle_platform_impl.Get());
-
-      g_angle_platform_shutdown = reinterpret_cast<ANGLEPlatformShutdownFunc>(
-          base::GetFunctionPointerFromNativeLibrary(gles_library,
-                                                    "ANGLEPlatformShutdown"));
-    }
-  }
-
   GLGetProcAddressProc get_proc_address =
       reinterpret_cast<GLGetProcAddressProc>(
           base::GetFunctionPointerFromNativeLibrary(egl_library,
                                                     "eglGetProcAddress"));
   if (!get_proc_address) {
     LOG(ERROR) << "eglGetProcAddress not found.";
     base::UnloadNativeLibrary(egl_library);
     base::UnloadNativeLibrary(gles_library);
     return false;
   }
@@ skipping 132 matching lines @@
 }
 
 void InitializeDebugGLBindings() {
   InitializeDebugGLBindingsEGL();
   InitializeDebugGLBindingsGL();
   InitializeDebugGLBindingsOSMESA();
   InitializeDebugGLBindingsWGL();
 }
 
 void ShutdownGLPlatform() {
-  // TODO(jmadill): Apply to all platforms eventually
-  if (g_angle_platform_shutdown) {
-    g_angle_platform_shutdown();
-  }
-
+  GLSurfaceEGL::ShutdownOneOff();
   ClearBindingsEGL();
   ClearBindingsGL();
   ClearBindingsOSMESA();
   ClearBindingsWGL();
 }
 
 }  // namespace init
 }  // namespace gl