X11: Use better visuals for OpenGL

ui/base/x/x11_util_internal.h

 // 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.
 
 #ifndef UI_BASE_X_X11_UTIL_INTERNAL_H_
 #define UI_BASE_X_X11_UTIL_INTERNAL_H_
 
 // This file declares utility functions for X11 (Linux only).
 //
 // These functions require the inclusion of the Xlib headers. Since the Xlib
 // headers pollute so much of the namespace, this should only be included
 // when needed.
 
 extern "C" {
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/XShm.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 }
 
+#include <memory>
+#include <unordered_map>
+
 #include "build/build_config.h"
 #include "ui/base/x/ui_base_x_export.h"
+#include "ui/gfx/x/x11_types.h"
+
+namespace base {
+template <typename T>
+struct DefaultSingletonTraits;
+}
 
 namespace ui {
 
 // --------------------------------------------------------------------------
 // NOTE: these functions cache the results and must be called from the UI
 // thread.
 // Get the XRENDER format id for ARGB32 (Skia's format).
 //
 // NOTE:Currently this don't support multiple screens/displays.
 UI_BASE_X_EXPORT XRenderPictFormat* GetRenderARGB32Format(Display* dpy);
 
 // --------------------------------------------------------------------------
 // X11 error handling.
 // Sets the X Error Handlers. Passing NULL for either will enable the default
 // error handler, which if called will log the error and abort the process.
 UI_BASE_X_EXPORT void SetX11ErrorHandlers(XErrorHandler error_handler,
                                           XIOErrorHandler io_error_handler);
 
 // NOTE: This function should not be called directly from the
 // X11 Error handler because it queries the server to decode the
 // error message, which may trigger other errors. A suitable workaround
 // is to post a task in the error handler to call this function.
 UI_BASE_X_EXPORT void LogErrorEventDescription(Display* dpy,
                                                const XErrorEvent& error_event);
 
 // --------------------------------------------------------------------------
 // Selects a visual with a preference for alpha support on compositing window
-// managers. The caller must compare depth to 32 to know if the returned visual
-// supports transparency. NULL parameters are allowed to install or query the
-// cached visual and depth.
+// managers.
 #if !defined(OS_CHROMEOS)
-UI_BASE_X_EXPORT void ChooseVisualForWindow(bool enable_transparent_visuals,
-                                            Visual** visual,
-                                            int* depth);
+class UI_BASE_X_EXPORT XVisualManager {
+ public:
+  static XVisualManager* GetInstance();
+
+  void ChooseVisualForWindow(bool want_argb_visual,
+                             Visual** visual,
+                             int* depth,
+                             Colormap* colormap,
+                             bool* using_argb_visual);
+
+  // Called by GpuDataManagerImplPrivate when GPUInfo becomes available.  It is
+  // necessary for the GPU process to find out which visuals are best for GL
+  // because we don't want to load GL in the browser process.
+  void OnGPUInfoChanged(bool software_rendering,
+                        VisualID default_visual_id,
+                        VisualID transparent_visual_id);
+
+  ~XVisualManager();
+
+ private:
+  friend struct base::DefaultSingletonTraits<XVisualManager>;
+
+  class XVisualData {
+   public:
+    XVisualData(XVisualInfo visual_info);

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

nit: explicit

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

Done.

+    ~XVisualData();
+
+    Colormap GetColormap();
+
+    const XVisualInfo visual_info;
+
+   private:
+    Colormap colormap_;
+  };
+
+  XVisualManager();
+
+  std::unordered_map<VisualID, std::unique_ptr<XVisualData>> visuals_;
+
+  XDisplay* display_;
+
+  VisualID default_visual_id_;
+  VisualID transparent_visual_id_;
+
+  bool using_compositing_wm_;
+  bool using_software_rendering_;
+  bool have_gpu_argb_visual_;
+};
 #endif
 
 }  // namespace ui
 
 #endif  // UI_BASE_X_X11_UTIL_INTERNAL_H_