Refactor GL surface format handling

ui/gl/init/gl_factory_ozone.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/trace_event/trace_event.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_context_egl.h"
@@ skipping 30 matching lines @@
       NOTREACHED();
   }
   return nullptr;
 }
 
 scoped_refptr<GLSurface> CreateDefaultOffscreenGLSurface(
     const gfx::Size& size) {
   switch (GetGLImplementation()) {
     case kGLImplementationOSMesaGL:
       return InitializeGLSurface(
-          new GLSurfaceOSMesa(GLSurface::SURFACE_OSMESA_BGRA, size));
+          new GLSurfaceOSMesa(
+              GLSurfaceFormat(GLSurfaceFormat::PIXEL_LAYOUT_BGRA), size));
     case kGLImplementationMockGL:
       return InitializeGLSurface(new GLSurfaceStub);
     default:
       NOTREACHED();
   }
   return nullptr;
 }
 
 }  // namespace
 
@@ skipping 62 matching lines @@
 
   if (HasGLOzone())
     return GetGLOzone()->CreateSurfacelessViewGLSurface(window);
 
   // TODO(kylechar): This is deprecated and can be removed once all Ozone
   // platforms use GLOzone instead.
   return GetSurfaceFactoryOzone()->CreateSurfacelessViewGLSurface(
       GetGLImplementation(), window);
 }
 
-scoped_refptr<GLSurface> CreateOffscreenGLSurface(const gfx::Size& size) {
+scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
+    const gfx::Size& size, GLSurfaceFormat format) {
   TRACE_EVENT0("gpu", "gl::init::CreateOffscreenGLSurface");
 
+  if (!format.IsDefault()) {
+    NOTREACHED() << "FATAL: Ozone only supports default-format surfaces.";
+    return nullptr;
+  }
+
   if (HasGLOzone())
     return GetGLOzone()->CreateOffscreenGLSurface(size);
 
   if (HasDefaultImplementation(GetGLImplementation()))
     return CreateDefaultOffscreenGLSurface(size);
 
   // TODO(kylechar): This is deprecated and can be removed once all Ozone
   // platforms use GLOzone instead.
   return GetSurfaceFactoryOzone()->CreateOffscreenGLSurface(
       GetGLImplementation(), size);
 }
 
 }  // namespace init
 }  // namespace gl