Refactor GL surface format handling

ui/gl/gl_surface_osmesa_win.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_win.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/windows_version.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_surface_wgl.h"
 #include "ui/gl/vsync_provider_win.h"
 
 // From ANGLE's egl/eglext.h.
 #if !defined(EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE)
 #define EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE \
   reinterpret_cast<EGLNativeDisplayType>(-2)
 #endif
 
 namespace gl {
 
 GLSurfaceOSMesaWin::GLSurfaceOSMesaWin(gfx::AcceleratedWidget window)
-    : GLSurfaceOSMesa(SURFACE_OSMESA_RGBA, gfx::Size(1, 1)),
+    : GLSurfaceOSMesa(GLSurfaceFormat(GLSurfaceFormat::PIXEL_LAYOUT_RGBA),
+                      gfx::Size(1, 1)),
       window_(window),
       device_context_(NULL) {
   DCHECK(window);
 }
 
 GLSurfaceOSMesaWin::~GLSurfaceOSMesaWin() {
   Destroy();
 }
 
-bool GLSurfaceOSMesaWin::Initialize(GLSurface::Format format) {
+bool GLSurfaceOSMesaWin::Initialize(GLSurfaceFormat format) {
   if (!GLSurfaceOSMesa::Initialize(format))
     return false;
 
   device_context_ = GetDC(window_);
   return true;
 }
 
 void GLSurfaceOSMesaWin::Destroy() {
   if (window_ && device_context_)
     ReleaseDC(window_, device_context_);
@@ skipping 72 matching lines @@
   // browser test to become flaky if there is a race condition between GL
   // context destruction and window destruction.
   StretchDIBits(device_context_, x, size.height() - y - height, width, height,
                 x, y, width, height, GetHandle(),
                 reinterpret_cast<BITMAPINFO*>(&info), DIB_RGB_COLORS, SRCCOPY);
 
   return gfx::SwapResult::SWAP_ACK;
 }
 
 }  // namespace gl