Refactor GL surface format handling

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 "ui/gl/gl_surface_osmesa.h"
 
 #include <algorithm>
 
 #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/scoped_make_current.h"
 
 namespace gl {
 
-GLSurfaceOSMesa::GLSurfaceOSMesa(GLSurface::Format format,
+GLSurfaceOSMesa::GLSurfaceOSMesa(GLSurfaceFormat format,
                                  const gfx::Size& size)
     : size_(size),
       format_(format) {
   // 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(GLSurface::Format format) {
+bool GLSurfaceOSMesa::Initialize(GLSurfaceFormat format) {
   return Resize(size_, 1.f, true);
 }
 
 void GLSurfaceOSMesa::Destroy() {
   buffer_.reset();
 }
 
 bool GLSurfaceOSMesa::Resize(const gfx::Size& new_size,
                              float scale_factor,
                              bool has_alpha) {
@@ skipping 49 matching lines @@
 }
 
 gfx::Size GLSurfaceOSMesa::GetSize() {
   return size_;
 }
 
 void* GLSurfaceOSMesa::GetHandle() {
   return buffer_.get();
 }
 
-GLSurface::Format GLSurfaceOSMesa::GetFormat() {
+GLSurfaceFormat GLSurfaceOSMesa::GetFormat() {
   return format_;
 }
 
 GLSurfaceOSMesa::~GLSurfaceOSMesa() {
   Destroy();
 }
 
 bool GLSurfaceOSMesaHeadless::IsOffscreen() { return false; }
 
 gfx::SwapResult GLSurfaceOSMesaHeadless::SwapBuffers() {
   return gfx::SwapResult::SWAP_ACK;
 }
 
 GLSurfaceOSMesaHeadless::GLSurfaceOSMesaHeadless()
-    : GLSurfaceOSMesa(SURFACE_OSMESA_BGRA, gfx::Size(1, 1)) {
+    : GLSurfaceOSMesa(
+          GLSurfaceFormat(GLSurfaceFormat::PIXEL_LAYOUT_BGRA),
+          gfx::Size(1, 1)) {
 }
 
 GLSurfaceOSMesaHeadless::~GLSurfaceOSMesaHeadless() { Destroy(); }
 
 }  // namespace gl