gpu: Upgrade to new ANGLE Platform Display init.

ui/gl/gl_bindings.cc

Index: ui/gl/gl_bindings.cc
diff --git a/ui/gl/gl_bindings.cc b/ui/gl/gl_bindings.cc
index 83b6b594e2dbbd2d967e6f551f173b7422f9983c..74282e19e38ecef991111f5d158d1296551c80fc 100644
--- a/ui/gl/gl_bindings.cc
+++ b/ui/gl/gl_bindings.cc
@@ -41,15 +41,17 @@ std::string DriverWGL::GetPlatformExtensions() {
 
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
 std::string DriverEGL::GetPlatformExtensions() {
-  EGLDisplay display =
 #if defined(OS_WIN)
-    GLSurfaceEGL::GetPlatformDisplay(GetPlatformDefaultEGLNativeDisplay());
+  EGLDisplay display = GLSurfaceEGL::InitializeDisplay();
+  if (display == EGL_NO_DISPLAY)
+    return "";

[Jamie Madill, 2015/04/20 18:33:11]

I wasn't sure if I should put the NO_DISPLAY check in the main body of the
function, because it theoretically would change the behaviour of the function on
non-Windows platforms.

[Zhenyao Mo, 2015/04/20 19:51:47]

If display isn't valid, eglQueryString just return NULL. So probably you can
unify the WIN and non WIN path behaviors.

[Jamie Madill, 2015/04/20 20:20:09]

One difference - if display is EGL_NO_DISPLAY and the EGL platform supports
EGL_EXT_client_extensions (or EGL 1.5), the EGL will return a list of client
extensions. (See GetClientExtensions below). I think in either case it makes
sense to unify, thanks.

 #else
-    g_driver_egl.fn.eglGetDisplayFn(GetPlatformDefaultEGLNativeDisplay());
-#endif
-
+  EGLDisplay display =
+      g_driver_egl.fn.eglGetDisplayFn(GetPlatformDefaultEGLNativeDisplay());
   DCHECK(g_driver_egl.fn.eglInitializeFn);
   g_driver_egl.fn.eglInitializeFn(display, NULL, NULL);
+#endif
+
   DCHECK(g_driver_egl.fn.eglQueryStringFn);
   const char* str = g_driver_egl.fn.eglQueryStringFn(display, EGL_EXTENSIONS);
   return str ? std::string(str) : "";