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

ui/gl/gl_surface_osmesa.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 "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "third_party/mesa/src/include/GL/osmesa.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface_osmesa.h"
 #include "ui/gl/scoped_make_current.h"
 
 namespace gfx {
 
-GLSurfaceOSMesa::GLSurfaceOSMesa(OSMesaSurfaceFormat format,
-                                 const gfx::Size& size)
-    : size_(size) {
+GLSurfaceOSMesa::GLSurfaceOSMesa(
+  OSMesaSurfaceFormat format,
+  const gfx::Size& size,
+  const gfx::SurfaceConfiguration requested_configuration)
+    : GLSurface(requested_configuration), size_(size) {
   switch (format) {
     case OSMesaSurfaceFormatBGRA:
       format_ = OSMESA_BGRA;
       break;
     case OSMesaSurfaceFormatRGBA:
       format_ = OSMESA_RGBA;
       break;
   }
   // Implementations of OSMesa surface do not support having a 0 size. In such
   // cases use a (1, 1) surface.
   if (size_.GetArea() == 0)
     size_.SetSize(1, 1);
 }
 
 bool GLSurfaceOSMesa::Initialize() {
   return Resize(size_);
 }
 
 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();
   bool was_current =
       current_context && current_context->IsCurrent(this);
   if (was_current) {
     scoped_make_current.reset(
         new ui::ScopedMakeCurrent(current_context, this));
     current_context->ReleaseCurrent(this);
   }
@@ skipping 52 matching lines @@
 }
 
 GLSurfaceOSMesa::~GLSurfaceOSMesa() {
   Destroy();
 }
 
 bool GLSurfaceOSMesaHeadless::IsOffscreen() { return false; }
 
 bool GLSurfaceOSMesaHeadless::SwapBuffers() { return true; }
 
-GLSurfaceOSMesaHeadless::GLSurfaceOSMesaHeadless()
-    : GLSurfaceOSMesa(OSMesaSurfaceFormatBGRA, gfx::Size(1, 1)) {
+GLSurfaceOSMesaHeadless::GLSurfaceOSMesaHeadless(
+    const gfx::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(); }
 
 }  // namespace gfx