Refactor GL surface format handling

ui/gl/init/gl_factory_x11.cc

Index: ui/gl/init/gl_factory_x11.cc
diff --git a/ui/gl/init/gl_factory_x11.cc b/ui/gl/init/gl_factory_x11.cc
index 88f86206e900cc5ece1eb3e89886edac3122fa31..6d938ef4619e0f5f98fe1ea9900a374a8ba04f49 100644
--- a/ui/gl/init/gl_factory_x11.cc
+++ b/ui/gl/init/gl_factory_x11.cc
@@ -85,16 +85,22 @@ scoped_refptr<GLSurface> CreateViewGLSurface(gfx::AcceleratedWidget window) {
   }
 }
 
-scoped_refptr<GLSurface> CreateOffscreenGLSurface(const gfx::Size& size) {
+scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
+    const gfx::Size& size, GLSurfaceFormat format) {
   TRACE_EVENT0("gpu", "gl::init::CreateOffscreenGLSurface");
   switch (GetGLImplementation()) {
     case kGLImplementationOSMesaGL:
-      return InitializeGLSurface(
-          new GLSurfaceOSMesa(GLSurface::SURFACE_OSMESA_RGBA, size));
+      if (format.IsDefault()) {
+        format = GLSurfaceFormat(GLSurfaceFormat::SURFACE_OSMESA_RGBA);
+      }
+      return InitializeGLSurfaceWithFormat(
+          new GLSurfaceOSMesa(format, size), format);
     case kGLImplementationDesktopGL:
-      return InitializeGLSurface(new UnmappedNativeViewGLSurfaceGLX(size));
+      return InitializeGLSurfaceWithFormat(
+          new UnmappedNativeViewGLSurfaceGLX(size), format);
     case kGLImplementationEGLGLES2:
-      return InitializeGLSurface(new PbufferGLSurfaceEGL(size));
+      return InitializeGLSurfaceWithFormat(
+          new PbufferGLSurfaceEGL(size), format);
     case kGLImplementationMockGL:
       return new GLSurfaceStub;
     default: