Update the native_viewport interface to allow specification of the surface configuration, currently…

ui/gl/gl_surface.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_SURFACE_H_
 #define UI_GL_GL_SURFACE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/gl/gl_export.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
 class GLContext;
 class GLImage;
 class VSyncProvider;
 
+struct SurfaceConfiguration {
+  SurfaceConfiguration()
+      : red_bits(8),
+        green_bits(8),
+        blue_bits(8),
+        alpha_bits(8),
+        depth_bits(0),
+        stencil_bits(0) {}

[abarth-chromium, 2015/06/09 00:30:22]

You can delete this constructor and just write:

uint8_t red_bits = 8;

below.

[iansf, 2015/06/09 01:52:04]

Done.

+
+  uint8_t red_bits;
+  uint8_t green_bits;
+  uint8_t blue_bits;
+  uint8_t alpha_bits;
+  uint8_t depth_bits;
+  uint8_t stencil_bits;
+};
+
 // Encapsulates a surface that can be rendered to with GL, hiding platform
 // specific management.
 class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
  public:
-  GLSurface();
+  explicit GLSurface(SurfaceConfiguration requested_configuration);
 
   // (Re)create the surface. TODO(apatrick): This is an ugly hack to allow the
   // EGL surface associated to be recreated without destroying the associated
   // context. The implementation of this function for other GLSurface derived
   // classes is in a pending changelist.
   virtual bool Initialize();
 
   // Destroys the surface.
   virtual void Destroy() = 0;
 
@@ skipping 105 matching lines @@
   virtual bool ScheduleOverlayPlane(int z_order,
                                     OverlayTransform transform,
                                     GLImage* image,
                                     const Rect& bounds_rect,
                                     const RectF& crop_rect);
 
   virtual bool IsSurfaceless() const;
 
   // Create a GL surface that renders directly to a view.
   static scoped_refptr<GLSurface> CreateViewGLSurface(
-      gfx::AcceleratedWidget window);
+      gfx::AcceleratedWidget window,
+      gfx::SurfaceConfiguration requested_configuration);

[abarth-chromium, 2015/06/09 00:30:22]

const gfx::SurfaceConfiguration&

[iansf, 2015/06/09 01:52:04]

Done.

 
 #if defined(USE_OZONE)
   // Create a GL surface that renders directly into a window with surfaceless
   // semantics - there is no default framebuffer and the primary surface must
   // be presented as an overlay. If surfaceless mode is not supported or
   // enabled it will return a null pointer.
   static scoped_refptr<GLSurface> CreateSurfacelessViewGLSurface(
-      gfx::AcceleratedWidget window);
+      gfx::AcceleratedWidget window,
+      gfx::SurfaceConfiguration requested_configuration);

[abarth-chromium, 2015/06/09 00:30:22]

const gfx::SurfaceConfiguration&

[iansf, 2015/06/09 01:52:04]

Done.

 #endif  // defined(USE_OZONE)
 
   // Create a GL surface used for offscreen rendering.
   static scoped_refptr<GLSurface> CreateOffscreenGLSurface(
-      const gfx::Size& size);
+      const gfx::Size& size,
+      gfx::SurfaceConfiguration requested_configuration);

[abarth-chromium, 2015/06/09 00:30:21]

const gfx::SurfaceConfiguration&

[iansf, 2015/06/09 01:52:04]

Done.

 
   static GLSurface* GetCurrent();
 
   // Called when the swap interval for the associated context changes.
   virtual void OnSetSwapInterval(int interval);
 
+  SurfaceConfiguration GetSurfaceConfiguration() {
+    return surface_configuration_;
+  };

[abarth-chromium, 2015/06/09 00:30:21]

const GetSurfaceConfiguration&

s/GetSurfaceConfiguration/surface_configuration/

Again, this is a case of using a unix_hacker name for a trivial getter.  If the
function was virtual, then using the StudlyCaps name would be correct.

[iansf, 2015/06/09 01:52:04]

Done.

+
  protected:
   virtual ~GLSurface();
   static bool InitializeOneOffImplementation(GLImplementation impl,
                                              bool fallback_to_osmesa,
                                              bool gpu_service_logging,
                                              bool disable_gl_drawing);
   static bool InitializeOneOffInternal();
   static void SetCurrent(GLSurface* surface);
 
   static bool ExtensionsContain(const char* extensions, const char* name);
 
  private:
+  SurfaceConfiguration surface_configuration_;
   friend class base::RefCounted<GLSurface>;
   friend class GLContext;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurface);
 };
 
 // Implementation of GLSurface that forwards all calls through to another
 // GLSurface.
 class GL_EXPORT GLSurfaceAdapter : public GLSurface {
  public:
@@ skipping 39 matching lines @@
 
  private:
   scoped_refptr<GLSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceAdapter);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_SURFACE_H_