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

ui/gl/gl_surface_glx.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.
 
 extern "C" {
 #include <X11/Xlib.h>
 }
 
 #include "ui/gl/gl_surface_glx.h"
 
@@ skipping 299 matching lines @@
 
 SGIVideoSyncThread* SGIVideoSyncThread::g_video_sync_thread = NULL;
 
 // In order to take advantage of GLX_SGI_video_sync, we need a display
 // for use on a separate thread. We must allocate this before the sandbox
 // goes up (rather than on-demand when we start the thread).
 Display* SGIVideoSyncProviderThreadShim::display_ = NULL;
 
 }  // namespace
 
-GLSurfaceGLX::GLSurfaceGLX() {}
+GLSurfaceGLX::GLSurfaceGLX(
+  const gfx::SurfaceConfiguration& requested_configuration)
+    : GLSurface(requested_configuration) {
+}
 
 bool GLSurfaceGLX::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
   // http://crbug.com/245466
   setenv("force_s3tc_enable", "true", 1);
 
   // SGIVideoSyncProviderShim (if instantiated) will issue X commands on
@@ skipping 66 matching lines @@
 bool GLSurfaceGLX::IsOMLSyncControlSupported() {
   return g_glx_oml_sync_control_supported;
 }
 
 void* GLSurfaceGLX::GetDisplay() {
   return g_display;
 }
 
 GLSurfaceGLX::~GLSurfaceGLX() {}
 
-NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX(gfx::AcceleratedWidget window)
-  : parent_window_(window),
+NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX(
+  gfx::AcceleratedWidget window,
+  const gfx::SurfaceConfiguration& requested_configuration)
+  : GLSurfaceGLX(requested_configuration),
+    parent_window_(window),
     window_(0),
     config_(NULL) {
 }
 
 gfx::AcceleratedWidget NativeViewGLSurfaceGLX::GetDrawableHandle() const {
   return window_;
 }
 
 bool NativeViewGLSurfaceGLX::Initialize() {
   XWindowAttributes attributes;
@@ skipping 103 matching lines @@
     // attempting to use GLX_ARB_create_context_robustness, in which
     // case we need a GLXFBConfig for the window in order to create a
     // context for it.
     //
     // TODO(kbr): this is not a reliable code path. On platforms which
     // support it, we should use glXChooseFBConfig in the browser
     // process to choose the FBConfig and from there the X Visual to
     // use when creating the window in the first place. Then we can
     // pass that FBConfig down rather than attempting to reconstitute
     // it.
+    //
+    // TODO(iansf): Perhaps instead of kbr's suggestion above, we can
+    // now use GLSurface::GetSurfaceConfiguration to use the returned
+    // gfx::SurfaceConfiguration with glXChooseFBConfig in a manner
+    // similar to that used in NativeViewGLSurfaceEGL::GetConfig.
 
     XWindowAttributes attributes;
     if (!XGetWindowAttributes(
         g_display,
         window_,
         &attributes)) {
       LOG(ERROR) << "XGetWindowAttributes failed for window " <<
           window_ << ".";
       return NULL;
     }
@@ skipping 41 matching lines @@
 }
 
 VSyncProvider* NativeViewGLSurfaceGLX::GetVSyncProvider() {
   return vsync_provider_.get();
 }
 
 NativeViewGLSurfaceGLX::~NativeViewGLSurfaceGLX() {
   Destroy();
 }
 
-PbufferGLSurfaceGLX::PbufferGLSurfaceGLX(const gfx::Size& size)
-  : size_(size),
+PbufferGLSurfaceGLX::PbufferGLSurfaceGLX(
+  const gfx::Size& size,
+  const gfx::SurfaceConfiguration& requested_configuration)
+  : GLSurfaceGLX(requested_configuration),
+    size_(size),
     config_(NULL),
     pbuffer_(0) {
   // Some implementations of Pbuffer do not support having a 0 size. For such
   // cases use a (1, 1) surface.
   if (size_.GetArea() == 0)
     size_.SetSize(1, 1);
 }
 
 bool PbufferGLSurfaceGLX::Initialize() {
   DCHECK(!pbuffer_);
@@ skipping 69 matching lines @@
 
 void* PbufferGLSurfaceGLX::GetConfig() {
   return config_;
 }
 
 PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() {
   Destroy();
 }
 
 }  // namespace gfx