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

ui/gl/gl_surface_osmesa.cc

Index: ui/gl/gl_surface_osmesa.cc
diff --git a/ui/gl/gl_surface_osmesa.cc b/ui/gl/gl_surface_osmesa.cc
index 7f1b1ad881d0bc1b6b2ce5a99a0bf6e80188ae89..941f24feaf0861fdbe56195ec3882ae47ac91d67 100644
--- a/ui/gl/gl_surface_osmesa.cc
+++ b/ui/gl/gl_surface_osmesa.cc
@@ -13,8 +13,9 @@
 namespace gfx {
 
 GLSurfaceOSMesa::GLSurfaceOSMesa(OSMesaSurfaceFormat format,
-                                 const gfx::Size& size)
-    : size_(size) {
+                                 const gfx::Size& size,
+                                 SurfaceConfiguration requested_configuration)
+    : GLSurface(requested_configuration), size_(size) {
   switch (format) {
     case OSMesaSurfaceFormatBGRA:
       format_ = OSMESA_BGRA;
@@ -37,6 +38,14 @@ void GLSurfaceOSMesa::Destroy() {
   buffer_.reset();
 }
 
+void* GLSurfaceOSMesa::GetConfig() {
+  // TODO(iansf): Possibly choose a configuration in a manner similar to
+  // NativeViewGLSurfaceEGL::GetConfig, using the gfx::SurfaceConfiguration
+  // returned by GLSurface::GetSurfaceConfiguration.
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
 bool GLSurfaceOSMesa::Resize(const gfx::Size& new_size) {
   scoped_ptr<ui::ScopedMakeCurrent> scoped_make_current;
   GLContext* current_context = GLContext::GetCurrent();
@@ -109,8 +118,19 @@ bool GLSurfaceOSMesaHeadless::IsOffscreen() { return false; }
 
 bool GLSurfaceOSMesaHeadless::SwapBuffers() { return true; }
 
-GLSurfaceOSMesaHeadless::GLSurfaceOSMesaHeadless()
-    : GLSurfaceOSMesa(OSMesaSurfaceFormatBGRA, gfx::Size(1, 1)) {
+GLSurfaceOSMesaHeadless::GLSurfaceOSMesaHeadless(
+    SurfaceConfiguration requested_configuration)
+    : GLSurfaceOSMesa(OSMesaSurfaceFormatBGRA,
+                      gfx::Size(1, 1),
+                      requested_configuration) {
+}
+
+void* GLSurfaceOSMesaHeadless::GetConfig() {
+  // TODO(iansf): Possibly choose a configuration in a manner similar to
+  // NativeViewGLSurfaceEGL::GetConfig, using the gfx::SurfaceConfiguration
+  // returned by GLSurface::GetSurfaceConfiguration.
+  NOTIMPLEMENTED();
+  return NULL;
 }
 
 GLSurfaceOSMesaHeadless::~GLSurfaceOSMesaHeadless() { Destroy(); }