Refactor GL surface format handling

ui/gl/gl_surface_osmesa_x11.cc

 // Copyright 2016 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_osmesa_x11.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace gl {
 
 GLSurfaceOSMesaX11::GLSurfaceOSMesaX11(gfx::AcceleratedWidget window)
-    : GLSurfaceOSMesa(SURFACE_OSMESA_BGRA, gfx::Size(1, 1)),
+    : GLSurfaceOSMesa(
+          GLSurfaceFormat(GLSurfaceFormat::PIXEL_LAYOUT_BGRA),
+          gfx::Size(1, 1)),
       xdisplay_(gfx::GetXDisplay()),
       window_graphics_context_(0),
       window_(window),
       pixmap_graphics_context_(0),
       pixmap_(0) {
   DCHECK(xdisplay_);
   DCHECK(window_);
 }
 
 // static
 bool GLSurfaceOSMesaX11::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
   if (!gfx::GetXDisplay()) {
     LOG(ERROR) << "XOpenDisplay failed.";
     return false;
   }
 
   initialized = true;
   return true;
 }
 
-bool GLSurfaceOSMesaX11::Initialize(GLSurface::Format format) {
+bool GLSurfaceOSMesaX11::Initialize(GLSurfaceFormat format) {
   if (!GLSurfaceOSMesa::Initialize(format))
     return false;
 
   window_graphics_context_ = XCreateGC(xdisplay_, window_, 0, NULL);
   if (!window_graphics_context_) {
     LOG(ERROR) << "XCreateGC failed.";
     Destroy();
     return false;
   }
 
@@ skipping 118 matching lines @@
             height, x, y);
 
   return gfx::SwapResult::SWAP_ACK;
 }
 
 GLSurfaceOSMesaX11::~GLSurfaceOSMesaX11() {
   Destroy();
 }
 
 }  // namespace gl