Refactor GL surface format handling

ui/gl/gl_context_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 "ui/gl/gl_context_osmesa.h"
 
 #include <GL/osmesa.h>
 
 #include "base/logging.h"
 #include "ui/gfx/geometry/size.h"
@@ skipping 14 matching lines @@
   // supported.
   DCHECK(!attribs.webgl_compatibility_context &&
          attribs.bind_generates_resource);
 
   DCHECK(!context_);
 
   OSMesaContext share_handle = static_cast<OSMesaContext>(
       share_group() ? share_group()->GetHandle() : nullptr);
 
   GLuint format = 0;
-  switch (compatible_surface->GetFormat()) {
-    case GLSurface::SURFACE_OSMESA_BGRA:
+  switch (compatible_surface->GetFormat().GetPixelLayout()) {
+    case GLSurfaceFormat::PIXEL_LAYOUT_BGRA:
       format = OSMESA_BGRA;
       break;
-    case GLSurface::SURFACE_OSMESA_RGBA:
+    case GLSurfaceFormat::PIXEL_LAYOUT_RGBA:
       format = OSMESA_RGBA;
       break;
     default:
       NOTREACHED();
       return false;
   }
   context_ = OSMesaCreateContextExt(format,
                                     0,  // depth bits
                                     0,  // stencil bits
                                     0,  // accum bits
@@ skipping 97 matching lines @@
 
 void GLContextOSMesa::OnSetSwapInterval(int interval) {
   DCHECK(IsCurrent(nullptr));
 }
 
 GLContextOSMesa::~GLContextOSMesa() {
   Destroy();
 }
 
 }  // namespace gl