Refactor GL surface format handling

ui/gl/init/gl_factory_mac.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/init/gl_factory.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 14 matching lines @@
 
 // A "no-op" surface. It is not required that a CGLContextObj have an
 // associated drawable (pbuffer or fullscreen context) in order to be
 // made current. Everywhere this surface type is used, we allocate an
 // FBO at the user level as the drawable of the associated context.
 class NoOpGLSurface : public GLSurface {
  public:
   explicit NoOpGLSurface(const gfx::Size& size) : size_(size) {}
 
   // Implement GLSurface.
-  bool Initialize(GLSurface::Format format) override { return true; }
+  bool Initialize(GLSurfaceFormat format) override { return true; }
   void Destroy() override {}
   bool IsOffscreen() override { return true; }
   gfx::SwapResult SwapBuffers() override {
     NOTREACHED() << "Cannot call SwapBuffers on a NoOpGLSurface.";
     return gfx::SwapResult::SWAP_FAILED;
   }
   gfx::Size GetSize() override { return size_; }
   void* GetHandle() override { return nullptr; }
   void* GetDisplay() override { return nullptr; }
   bool IsSurfaceless() const override { return true; }
@@ skipping 60 matching lines @@
       return InitializeGLSurface(new GLSurfaceOSMesaHeadless());
     }
     case kGLImplementationMockGL:
       return new GLSurfaceStub;
     default:
       NOTREACHED();
       return nullptr;
   }
 }
 
-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));
+      format.SetDefaultPixelLayout(GLSurfaceFormat::PIXEL_LAYOUT_RGBA);
+      return InitializeGLSurfaceWithFormat(
+          new GLSurfaceOSMesa(format, size), format);
     case kGLImplementationDesktopGL:
     case kGLImplementationDesktopGLCoreProfile:
     case kGLImplementationAppleGL:
-      return InitializeGLSurface(new NoOpGLSurface(size));
+      return InitializeGLSurfaceWithFormat(
+          new NoOpGLSurface(size), format);
     case kGLImplementationMockGL:
       return new GLSurfaceStub;
     default:
       NOTREACHED();
       return nullptr;
   }
 }
 
 }  // namespace init
 }  // namespace gl