Add casts for EGLNativeDisplayType to XDisplay to use X functions with OZONE.

ui/gl/gl_bindings.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_GL_GL_BINDINGS_H_
 #define UI_GL_GL_BINDINGS_H_
 
 // Includes the platform independent and platform dependent GL headers.
 // Only include this in cc files. It pulls in system headers, including
 // the X11 headers on linux, which define all kinds of macros that are
@@ skipping 357 matching lines @@
 struct GL_EXPORT DriverGLX {
   void InitializeStaticBindings();
   void InitializeDynamicBindings(GLContext* context);
   void InitializeDebugBindings();
   void ClearBindings();
 
   ProcsGLX fn;
   ProcsGLX debug_fn;
   ExtensionsGLX ext;
 };
+
+#if defined(USE_OZONE)
+// OZONE build defines EGLNativeDisplayType like intptr_t and this requires
+// reinterpret casts for use with X functions.
+inline EGLNativeDisplayType XDisplayToEGLNativeDisplay(::Display* display) {
+  COMPILE_ASSERT(sizeof(EGLNativeDisplayType) == sizeof(::Display*),
+      "EGLNativeDisplayType size should be equal to pointer size for"
+      "OZONE with x11 builds");
+  return reinterpret_cast<EGLNativeDisplayType>(display);
+}
+
+inline ::Display* EGLNativeDisplayToXDisplay(EGLNativeDisplayType display) {
+  return reinterpret_cast<::Display*>(display);
+}
+#else
+inline EGLNativeDisplayType XDisplayToEGLNativeDisplay(::Display* display) {
+  return display;
+}
+
+inline ::Display* EGLNativeDisplayToXDisplay(EGLNativeDisplayType display) {
+  return display;
+}
+#endif
 #endif
 
 // This #define is here to support autogenerated code.
 #define g_current_gl_context g_current_gl_context_tls->Get()
 GL_EXPORT extern base::ThreadLocalPointer<GLApi>* g_current_gl_context_tls;
 
 GL_EXPORT extern OSMESAApi* g_current_osmesa_context;
 GL_EXPORT extern DriverGL g_driver_gl;
 GL_EXPORT extern DriverOSMESA g_driver_osmesa;
 
@@ skipping 19 matching lines @@
 #elif defined(OS_ANDROID)
 
 GL_EXPORT extern EGLApi* g_current_egl_context;
 GL_EXPORT extern DriverEGL g_driver_egl;
 
 #endif
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_BINDINGS_H_