gl: Remove redundant methods/variables from GLSurfaceFormat

ui/gl/gl_surface_egl.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_egl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 253 matching lines @@
     LOG(ERROR) << "eglChooseConfig failed with error "
                << GetLastEGLErrorString();
     return false;
   }
   if (*num_configs == 0) {
     return false;
   }
   return true;
 }
 
-EGLConfig ChooseConfig(GLSurfaceFormat format) {
+EGLConfig ChooseConfig(GLSurfaceFormat format, bool surfaceless) {
   // Choose an EGL configuration.
   // On X this is only used for PBuffer surfaces.
 
   std::vector<EGLint> renderable_types;
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableES3GLContext)) {
     renderable_types.push_back(EGL_OPENGL_ES3_BIT);
   }
   renderable_types.push_back(EGL_OPENGL_ES2_BIT);
 
   EGLint buffer_size = format.GetBufferSize();
   EGLint alpha_size = 8;
   bool want_rgb565 = buffer_size == 16;
   EGLint depth_size = format.GetDepthBits();
   EGLint stencil_size = format.GetStencilBits();
   EGLint samples = format.GetSamples();
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
   // If we're using ANGLE_NULL, we may not have a display, in which case we
   // can't use XVisualManager.
   if (g_native_display) {
     ui::XVisualManager::GetInstance()->ChooseVisualForWindow(
         true, nullptr, &buffer_size, nullptr, nullptr);
     alpha_size = buffer_size == 32 ? 8 : 0;
   }
 #endif
 
-  EGLint surface_type = (format.IsSurfaceless()
-                            ? EGL_DONT_CARE
-                            : EGL_WINDOW_BIT | EGL_PBUFFER_BIT);
+  EGLint surface_type =
+      (surfaceless ? EGL_DONT_CARE : EGL_WINDOW_BIT | EGL_PBUFFER_BIT);
 
   for (auto renderable_type : renderable_types) {
     EGLint config_attribs_8888[] = {EGL_BUFFER_SIZE,
                                     buffer_size,
                                     EGL_ALPHA_SIZE,
                                     alpha_size,
                                     EGL_BLUE_SIZE,
                                     8,
                                     EGL_GREEN_SIZE,
                                     8,
@@ skipping 173 matching lines @@
 GLSurfaceFormat GLSurfaceEGL::GetFormat() {
   return format_;
 }
 
 EGLDisplay GLSurfaceEGL::GetDisplay() {
   return g_display;
 }
 
 EGLConfig GLSurfaceEGL::GetConfig() {
   if (!config_) {
-    config_ = ChooseConfig(format_);
+    config_ = ChooseConfig(format_, IsSurfaceless());
   }
   return config_;
 }
 
 // static
 bool GLSurfaceEGL::InitializeOneOff(EGLNativeDisplayType native_display) {
   if (initialized_)
     return true;
 
   // Must be called before InitializeDisplay().
@@ skipping 685 matching lines @@
   }
 
   return handle;
 #endif
 }
 
 PbufferGLSurfaceEGL::~PbufferGLSurfaceEGL() {
   Destroy();
 }
 
-SurfacelessEGL::SurfacelessEGL(const gfx::Size& size)
-    : size_(size) {
-  format_ = GLSurfaceFormat();
-  format_.SetIsSurfaceless();
-}
+SurfacelessEGL::SurfacelessEGL(const gfx::Size& size) : size_(size) {}
 
 bool SurfacelessEGL::Initialize(GLSurfaceFormat format) {
-  format.SetIsSurfaceless();
   format_ = format;
   return true;
 }
 
 void SurfacelessEGL::Destroy() {
 }
 
 bool SurfacelessEGL::IsOffscreen() {
   return true;
 }
@@ skipping 23 matching lines @@
 }
 
 void* SurfacelessEGL::GetShareHandle() {
   return NULL;
 }
 
 SurfacelessEGL::~SurfacelessEGL() {
 }
 
 }  // namespace gl