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

ui/gl/gl_surface_x11.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.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_surface_glx.h"
 #include "ui/gl/gl_surface_osmesa.h"
 #include "ui/gl/gl_surface_stub.h"
 
 namespace gfx {
 
 // This OSMesa GL surface can use XLib to swap the contents of the buffer to a
 // view.
 class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa {
  public:
-  explicit NativeViewGLSurfaceOSMesa(gfx::AcceleratedWidget window);
+  NativeViewGLSurfaceOSMesa(
+    gfx::AcceleratedWidget window,
+    const gfx::SurfaceConfiguration& requested_configuration);
 
   static bool InitializeOneOff();
 
   // Implement a subset of GLSurface.
   bool Initialize() override;
   void Destroy() override;
   bool Resize(const gfx::Size& new_size) override;
   bool IsOffscreen() override;
   bool SwapBuffers() override;
   bool SupportsPostSubBuffer() override;
@@ skipping 33 matching lines @@
       }
       break;
     default:
       break;
   }
 
   return true;
 }
 
 NativeViewGLSurfaceOSMesa::NativeViewGLSurfaceOSMesa(
-    gfx::AcceleratedWidget window)
-    : GLSurfaceOSMesa(OSMesaSurfaceFormatBGRA, gfx::Size(1, 1)),
+    gfx::AcceleratedWidget window,
+    const gfx::SurfaceConfiguration& requested_configuration)
+    : GLSurfaceOSMesa(OSMesaSurfaceFormatBGRA,
+                      gfx::Size(1, 1),
+                      requested_configuration),
       xdisplay_(gfx::GetXDisplay()),
       window_graphics_context_(0),
       window_(window),
       pixmap_graphics_context_(0),
       pixmap_(0) {
   DCHECK(xdisplay_);
   DCHECK(window_);
 }
 
 // static
@@ skipping 173 matching lines @@
             y);
 
   return true;
 }
 
 NativeViewGLSurfaceOSMesa::~NativeViewGLSurfaceOSMesa() {
   Destroy();
 }
 
 scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface(
-    gfx::AcceleratedWidget window) {
+    gfx::AcceleratedWidget window,
+    const gfx::SurfaceConfiguration& requested_configuration) {
   TRACE_EVENT0("gpu", "GLSurface::CreateViewGLSurface");
   switch (GetGLImplementation()) {
     case kGLImplementationOSMesaGL: {
       scoped_refptr<GLSurface> surface(
-          new NativeViewGLSurfaceOSMesa(window));
+          new NativeViewGLSurfaceOSMesa(window, requested_configuration));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
     case kGLImplementationDesktopGL: {
-      scoped_refptr<GLSurface> surface(new NativeViewGLSurfaceGLX(window));
+      scoped_refptr<GLSurface> surface(
+        new NativeViewGLSurfaceGLX(window, requested_configuration));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
     case kGLImplementationEGLGLES2: {
       DCHECK(window != gfx::kNullAcceleratedWidget);
-      scoped_refptr<GLSurface> surface(new NativeViewGLSurfaceEGL(window));
+      scoped_refptr<GLSurface> surface(
+        new NativeViewGLSurfaceEGL(window, requested_configuration));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
     case kGLImplementationMockGL:
-      return new GLSurfaceStub;
+      return new GLSurfaceStub(requested_configuration);
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 scoped_refptr<GLSurface> GLSurface::CreateOffscreenGLSurface(
-    const gfx::Size& size) {
+    const gfx::Size& size,
+    const gfx::SurfaceConfiguration& requested_configuration) {
   TRACE_EVENT0("gpu", "GLSurface::CreateOffscreenGLSurface");
   switch (GetGLImplementation()) {
     case kGLImplementationOSMesaGL: {
       scoped_refptr<GLSurface> surface(
-          new GLSurfaceOSMesa(OSMesaSurfaceFormatRGBA, size));
+          new GLSurfaceOSMesa(OSMesaSurfaceFormatRGBA,
+                              size,
+                              requested_configuration));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
     case kGLImplementationDesktopGL: {
-      scoped_refptr<GLSurface> surface(new PbufferGLSurfaceGLX(size));
+      scoped_refptr<GLSurface> surface(
+        new PbufferGLSurfaceGLX(size, requested_configuration));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
     case kGLImplementationEGLGLES2: {
-      scoped_refptr<GLSurface> surface(new PbufferGLSurfaceEGL(size));
+      scoped_refptr<GLSurface> surface(
+        new PbufferGLSurfaceEGL(size, requested_configuration));
       if (!surface->Initialize())
         return NULL;
 
       return surface;
     }
     case kGLImplementationMockGL:
-      return new GLSurfaceStub;
+      return new GLSurfaceStub(requested_configuration);
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
   return gfx::GetXDisplay();
 }
 
 }  // namespace gfx