X11: Use better visuals for OpenGL

ui/gl/gl_context.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_CONTEXT_H_
 #define UI_GL_GL_CONTEXT_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/cancelable_callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "ui/gl/gl_export.h"
 #include "ui/gl/gl_share_group.h"
 #include "ui/gl/gl_state_restorer.h"
 #include "ui/gl/gpu_preference.h"
 
 namespace gl {
 class YUVToRGBConverter;
 }  // namespace gl
 
@@ skipping 99 matching lines @@
 
   // Returns the GL version string. The context must be current.
   virtual std::string GetGLVersion();
 
   // Returns the GL renderer string. The context must be current.
   virtual std::string GetGLRenderer();
 
   // Returns a helper structure to convert YUV textures to RGB textures.
   virtual YUVToRGBConverter* GetYUVToRGBConverter();
 
+  base::WeakPtr<GLContext> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }

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

The contexts already tell their GLShareGroup when they get destroyed. Maybe we
can avoid this?

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

Done.

+
  protected:
   virtual ~GLContext();
 
   // Will release the current context when going out of scope, unless canceled.
   class ScopedReleaseCurrent {
    public:
     ScopedReleaseCurrent();
     ~ScopedReleaseCurrent();
 
     void Cancel();
@@ skipping 24 matching lines @@
 
   scoped_refptr<GLShareGroup> share_group_;
   GLContext* current_virtual_context_;
   bool state_dirtied_externally_;
   std::unique_ptr<GLStateRestorer> state_restorer_;
   std::unique_ptr<GLVersionInfo> version_info_;
 
   int swap_interval_;
   bool force_swap_interval_zero_;
 
+  base::WeakPtrFactory<GLContext> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(GLContext);
 };
 
 class GL_EXPORT GLContextReal : public GLContext {
  public:
   explicit GLContextReal(GLShareGroup* share_group);
   scoped_refptr<GPUTimingClient> CreateGPUTimingClient() override;
 
  protected:
   ~GLContextReal() override;
 
   void SetCurrent(GLSurface* surface) override;
 
  private:
   std::unique_ptr<GPUTiming> gpu_timing_;
   DISALLOW_COPY_AND_ASSIGN(GLContextReal);
 };
 
 // Wraps GLContext in scoped_refptr and tries to initializes it. Returns a
 // scoped_refptr containing the initialized GLContext or nullptr if
 // initialization fails.
 GL_EXPORT scoped_refptr<GLContext> InitializeGLContext(
     scoped_refptr<GLContext> context,
     GLSurface* compatible_surface,
     GpuPreference gpu_preference);
 
 }  // namespace gl
 
 #endif  // UI_GL_GL_CONTEXT_H_