X11: Use better visuals for OpenGL

ui/gl/gl_surface_egl.cc

 // 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.
 
 #include "ui/gl/gl_surface_egl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 18 matching lines @@
 #include "ui/gl/gl_surface_stub.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/scoped_make_current.h"
 #include "ui/gl/sync_control_vsync_provider.h"
 
 #if defined(OS_ANDROID)
 #include <android/native_window_jni.h>
 #endif
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-extern "C" {
-#include <X11/Xlib.h>
-#define Status int
-}
-#include "ui/gfx/x/x11_switches.h"  // nogncheck
+#include "ui/gl/gl_visual_picker_glx.h"

[piman, 2016/09/22 21:24:55]

When we're using EGL, we are not using GLX, so I don't think this will work...

[Tom (Use chromium acct), 2016/09/23 20:00:37]

Done.  I opted to use XVisualManager instead.  Unfortunately this means I also
needed to add a dependency on ui/base/x.  PLMK if this is not right

[piman, 2016/09/26 21:13:29]

I think this is ok.

 #endif
 
 #if !defined(EGL_FIXED_SIZE_ANGLE)
 #define EGL_FIXED_SIZE_ANGLE 0x3201
 #endif
 
 #if !defined(EGL_OPENGL_ES3_BIT)
 #define EGL_OPENGL_ES3_BIT 0x00000040
 #endif
 
@@ skipping 114 matching lines @@
 
   display_attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
   display_attribs.push_back(platform_type);
 
   if (warpDevice) {
     display_attribs.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
     display_attribs.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE);
   }
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-  std::string visualid_str =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kX11VisualID);
-  unsigned int visualid = 0;
-  bool succeed = base::StringToUint(visualid_str, &visualid);
-  DCHECK(succeed);
   display_attribs.push_back(EGL_X11_VISUAL_ID_ANGLE);
-  display_attribs.push_back((EGLint)visualid);
+  display_attribs.push_back(
+      (EGLint)gl::GLVisualPickerGLX::GetInstance()->rgba_visual().visualid);

[piman, 2016/09/22 21:24:55]

nit: static_cast instead of c-style casts.

[Tom (Use chromium acct), 2016/09/23 20:00:37]

Done.

 #endif
 
   display_attribs.push_back(EGL_NONE);
 
   return eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE,
                                   reinterpret_cast<void*>(native_display),
                                   &display_attribs[0]);
 }
 
 EGLDisplay GetDisplayFromType(DisplayType display_type,
@@ skipping 71 matching lines @@
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableUnsafeES3APIs)) {
     renderable_types.push_back(EGL_OPENGL_ES3_BIT);
   }
   renderable_types.push_back(EGL_OPENGL_ES2_BIT);
 
   EGLint buffer_size = 32;
   EGLint alpha_size = 8;
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kWindowDepth)) {
-    std::string depth =
-        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-            switches::kWindowDepth);
-
-    bool succeed = base::StringToInt(depth, &buffer_size);
-    DCHECK(succeed);
-
-    alpha_size = buffer_size == 32 ? 8 : 0;
-  }
+  buffer_size = gl::GLVisualPickerGLX::GetInstance()->rgba_visual().depth;
+  alpha_size = buffer_size == 32 ? 8 : 0;
 #endif
 
   EGLint surface_type = (format == GLSurface::SURFACE_SURFACELESS)
                             ? EGL_DONT_CARE
                             : EGL_WINDOW_BIT | EGL_PBUFFER_BIT;
 
   for (auto renderable_type : renderable_types) {
     EGLint config_attribs_8888[] = {EGL_BUFFER_SIZE,
                                     buffer_size,
                                     EGL_ALPHA_SIZE,
@@ skipping 893 matching lines @@
 }
 
 void* SurfacelessEGL::GetShareHandle() {
   return NULL;
 }
 
 SurfacelessEGL::~SurfacelessEGL() {
 }
 
 }  // namespace gl