Less X connections.

ui/gfx/gl/gl_surface_egl.cc

 // Copyright (c) 2011 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/gfx/gl/gl_surface_egl.h"
 
 #include "build/build_config.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #if !defined(OS_ANDROID)
 #include "third_party/angle/include/EGL/egl.h"
 #include "third_party/angle/include/EGL/eglext.h"
 #endif
 #include "ui/gfx/gl/egl_util.h"
 
 #if defined(OS_ANDROID)
 #include <EGL/egl.h>
 #endif
 
 // This header must come after the above third-party include, as
 // it brings in #defines that cause conflicts.
 #include "ui/gfx/gl/gl_bindings.h"
 
 #if defined(USE_X11) && !defined(USE_WAYLAND)
 extern "C" {
 #include <X11/Xlib.h>
 }
+#include "ui/base/x/x11_util.h"
 #endif
 
 #if defined(USE_WAYLAND)
 #include "ui/wayland/wayland_display.h"
 #endif
 
 namespace gfx {
 
 namespace {
 EGLConfig g_config;
 EGLDisplay g_display;
-EGLNativeDisplayType g_native_display;
 EGLConfig g_software_config;
 EGLDisplay g_software_display;
 EGLNativeDisplayType g_software_native_display;
 }
 
 GLSurfaceEGL::GLSurfaceEGL() : software_(false) {
 }
 
 GLSurfaceEGL::~GLSurfaceEGL() {
 }
 
+// static
 bool GLSurfaceEGL::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
-#if defined(USE_WAYLAND)
-  g_native_display = ui::WaylandDisplay::Connect(NULL)->display();
-#elif defined(USE_X11)
-  g_native_display = XOpenDisplay(NULL);
-#else
-  g_native_display = EGL_DEFAULT_DISPLAY;
-#endif
-  g_display = eglGetDisplay(g_native_display);
+  g_display = eglGetDisplay(GetNativeDisplay());
   if (!g_display) {
     LOG(ERROR) << "eglGetDisplay failed with error " << GetLastEGLErrorString();
     return false;
   }
 
   if (!eglInitialize(g_display, NULL, NULL)) {
     LOG(ERROR) << "eglInitialize failed with error " << GetLastEGLErrorString();
     return false;
   }
 
@@ skipping 83 matching lines @@
 }
 
 EGLDisplay GLSurfaceEGL::GetDisplay() {
   return software_ ? g_software_display : g_display;
 }
 
 EGLConfig GLSurfaceEGL::GetConfig() {
   return software_ ? g_software_config : g_config;
 }
 
+// static
 EGLDisplay GLSurfaceEGL::GetHardwareDisplay() {
   return g_display;
 }
 
+// static
 EGLDisplay GLSurfaceEGL::GetSoftwareDisplay() {
   return g_software_display;
 }
 
+// static
 EGLNativeDisplayType GLSurfaceEGL::GetNativeDisplay() {
+#if defined(USE_WAYLAND)
+  static EGLNativeDisplayType g_native_display = NULL;

[apatrick_chromium, 2011/12/08 20:16:24]

nit: drop the g_ for a local variable.

+  if (!g_native_display)
+    g_native_display = ui::WaylandDisplay::Connect(NULL)->display();
   return g_native_display;
+#elif defined(USE_X11)
+  return ui::GetXDisplay();
+#else
+  return EGL_DEFAULT_DISPLAY;
+#endif
 }
 
 NativeViewGLSurfaceEGL::NativeViewGLSurfaceEGL(bool software,
                                                gfx::PluginWindowHandle window)
     : window_(window),
       surface_(NULL),
       supports_post_sub_buffer_(false)
 {
   software_ = software;
 }
@@ skipping 194 matching lines @@
                                    EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE,
                                    &handle)) {
     return NULL;
   }
 
   return handle;
 #endif
 }
 
 }  // namespace gfx