Refactor GL surface format handling

ui/gl/gl_surface_egl.h

 // 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.
 
 #ifndef UI_GL_GL_SURFACE_EGL_H_
 #define UI_GL_GL_SURFACE_EGL_H_
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
@@ skipping 57 matching lines @@
 };
 
 // Interface for EGL surface.
 class GL_EXPORT GLSurfaceEGL : public GLSurface {
  public:
   GLSurfaceEGL();
 
   // Implement GLSurface.
   EGLDisplay GetDisplay() override;
   EGLConfig GetConfig() override;
-  GLSurface::Format GetFormat() override;
+  GLSurfaceFormat GetFormat() override;
 
   static bool InitializeOneOff(EGLNativeDisplayType native_display);
   static void ShutdownOneOff();
   static EGLDisplay GetHardwareDisplay();
   static EGLDisplay InitializeDisplay(EGLNativeDisplayType native_display);
   static EGLNativeDisplayType GetNativeDisplay();
 
   // These aren't particularly tied to surfaces, but since we already
   // have the static InitializeOneOff here, it's easiest to reuse its
   // initialization guards.
   static const char* GetEGLExtensions();
   static bool HasEGLExtension(const char* name);
   static bool IsCreateContextRobustnessSupported();
   static bool IsCreateContextBindGeneratesResourceSupported();
   static bool IsCreateContextWebGLCompatabilitySupported();
   static bool IsEGLSurfacelessContextSupported();
   static bool IsDirectCompositionSupported();
 
  protected:
   ~GLSurfaceEGL() override;
 
   EGLConfig config_ = nullptr;
-  GLSurface::Format format_ = GLSurface::SURFACE_DEFAULT;
+  GLSurfaceFormat format_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceEGL);
   static bool initialized_;
 };
 
 // Encapsulates an EGL surface bound to a view.
 class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
  public:
   explicit NativeViewGLSurfaceEGL(EGLNativeWindowType window);
 
   // Implement GLSurface.
   using GLSurfaceEGL::Initialize;
-  bool Initialize(GLSurface::Format format) override;
+  bool Initialize(GLSurfaceFormat format) override;
   void Destroy() override;
   bool Resize(const gfx::Size& size,
               float scale_factor,
               bool has_alpha) override;
   bool Recreate() override;
   bool IsOffscreen() override;
   gfx::SwapResult SwapBuffers() override;
   gfx::Size GetSize() override;
   EGLSurface GetHandle() override;
   bool SupportsSwapBuffersWithDamage() override;
@@ skipping 58 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceEGL);
 };
 
 // Encapsulates a pbuffer EGL surface.
 class GL_EXPORT PbufferGLSurfaceEGL : public GLSurfaceEGL {
  public:
   explicit PbufferGLSurfaceEGL(const gfx::Size& size);
 
   // Implement GLSurface.
-  bool Initialize() override;
-  bool Initialize(GLSurface::Format format) override;
+  bool Initialize(GLSurfaceFormat format) override;
   void Destroy() override;
   bool IsOffscreen() override;
   gfx::SwapResult SwapBuffers() override;
   gfx::Size GetSize() override;
   bool Resize(const gfx::Size& size,
               float scale_factor,
               bool has_alpha) override;
   EGLSurface GetHandle() override;
   void* GetShareHandle() override;
 
  protected:
   ~PbufferGLSurfaceEGL() override;
 
  private:
   gfx::Size size_;
   EGLSurface surface_;
 
   DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceEGL);
 };
 
 // SurfacelessEGL is used as Offscreen surface when platform supports
 // KHR_surfaceless_context and GL_OES_surfaceless_context. This would avoid the
 // need to create a dummy EGLsurface in case we render to client API targets.
 class GL_EXPORT SurfacelessEGL : public GLSurfaceEGL {
  public:
   explicit SurfacelessEGL(const gfx::Size& size);
 
   // Implement GLSurface.
-  bool Initialize() override;
-  bool Initialize(GLSurface::Format format) override;
+  bool Initialize(GLSurfaceFormat format) override;
   void Destroy() override;
   bool IsOffscreen() override;
   bool IsSurfaceless() const override;
   gfx::SwapResult SwapBuffers() override;
   gfx::Size GetSize() override;
   bool Resize(const gfx::Size& size,
               float scale_factor,
               bool has_alpha) override;
   EGLSurface GetHandle() override;
   void* GetShareHandle() override;
 
  protected:
   ~SurfacelessEGL() override;
 
  private:
   gfx::Size size_;
   DISALLOW_COPY_AND_ASSIGN(SurfacelessEGL);
 };
 
 }  // namespace gl
 
 #endif  // UI_GL_GL_SURFACE_EGL_H_