Roll ANGLE 6df9b3..7825f6

ui/gl/gl_surface_egl.cc

Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index 98a3a23f7d2e22bc6a67bf9870a3f8dba568ac03..2dcdc883a0e9ac3e3ac4921b758c2b169d5a50d7 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -39,18 +39,26 @@ extern "C" {
 
 #if defined(OS_WIN)
 // From ANGLE's egl/eglext.h.
-#if !defined(EGL_PLATFORM_ANGLE_ANGLE)
-#define EGL_PLATFORM_ANGLE_ANGLE 0x3201
-#endif
-#if !defined(EGL_PLATFORM_ANGLE_TYPE_ANGLE)
-#define EGL_PLATFORM_ANGLE_TYPE_ANGLE 0x3202
-#endif
-#if !defined(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
-#define EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE 0x3207
-#endif
-#if !defined(EGL_PLATFORM_ANGLE_USE_WARP_ANGLE)
-#define EGL_PLATFORM_ANGLE_USE_WARP_ANGLE 0x3208
-#endif
+
+#ifndef EGL_ANGLE_platform_angle
+#define EGL_ANGLE_platform_angle 1
+#define EGL_PLATFORM_ANGLE_ANGLE 0x3202
+#define EGL_PLATFORM_ANGLE_TYPE_ANGLE 0x3203
+#define EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE 0x3204
+#define EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE 0x3205
+#define EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE 0x3206
+#endif /* EGL_ANGLE_platform_angle */
+
+#ifndef EGL_ANGLE_platform_angle_d3d
+#define EGL_ANGLE_platform_angle_d3d 1
+#define EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE 0x3207
+#define EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE 0x3208
+#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE 0x3209
+#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE 0x320A
+#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE 0x320B
+#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE 0x320C
+#endif /* EGL_ANGLE_platform_angle_d3d */
+
 #endif  // defined(OS_WIN)
 
 using ui::GetLastEGLErrorString;
@@ -313,8 +321,12 @@ GLSurfaceEGL::~GLSurfaceEGL() {
 
 #if defined(OS_WIN)
 static const EGLint kDisplayAttribsWarp[] {
-  EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
-  EGL_PLATFORM_ANGLE_USE_WARP_ANGLE, EGL_TRUE,
+  EGL_PLATFORM_ANGLE_TYPE_ANGLE,
+  EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
+
+  EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE,
+  EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE,
+
   EGL_NONE
 };