Fix EGL configs with ozone and surfaceless surfaces.

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 265 matching lines @@
         base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             switches::kWindowDepth);
 
     bool succeed = base::StringToInt(depth, &buffer_size);
     DCHECK(succeed);
 
     alpha_size = buffer_size == 32 ? 8 : 0;
   }
 #endif
 
+  EGLint surface_type = (format == GLSurface::SURFACE_SURFACELESS)
+                            ? EGL_DONT_CARE
+                            : EGL_WINDOW_BIT | EGL_PBUFFER_BIT;
+
   EGLint config_attribs_8888[] = {
     EGL_BUFFER_SIZE, buffer_size,
     EGL_ALPHA_SIZE, alpha_size,
     EGL_BLUE_SIZE, 8,
     EGL_GREEN_SIZE, 8,
     EGL_RED_SIZE, 8,
     EGL_RENDERABLE_TYPE, renderable_type,
-    EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
+    EGL_SURFACE_TYPE, surface_type,
     EGL_NONE
   };
 
   EGLint* choose_attributes = config_attribs_8888;
   EGLint config_attribs_565[] = {
     EGL_BUFFER_SIZE, 16,
     EGL_BLUE_SIZE, 5,
     EGL_GREEN_SIZE, 6,
     EGL_RED_SIZE, 5,
     EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
+    EGL_SURFACE_TYPE, surface_type,
     EGL_NONE
   };
   if (format == GLSurface::SURFACE_RGB565) {
     choose_attributes = config_attribs_565;
   }
 
   EGLint num_configs;
   EGLint config_size = 1;
   EGLConfig config = nullptr;
   EGLConfig* config_data = &config;
@@ skipping 114 matching lines @@
     }
   }
 
   // If no displays are available due to missing angle extensions or invalid
   // flags, request the default display.
   if (init_displays->empty()) {
     init_displays->push_back(DEFAULT);
   }
 }
 
-GLSurfaceEGL::GLSurfaceEGL() :
-    config_(nullptr) {}
+GLSurfaceEGL::GLSurfaceEGL() {}
 
 bool GLSurfaceEGL::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
   InitializeDisplay();
   if (g_display == EGL_NO_DISPLAY)
     return false;
 
@@ skipping 614 matching lines @@
   return handle;
 #endif
 }
 
 PbufferGLSurfaceEGL::~PbufferGLSurfaceEGL() {
   Destroy();
 }
 
 SurfacelessEGL::SurfacelessEGL(const gfx::Size& size)
     : size_(size) {
+  format_ = GLSurface::SURFACE_SURFACELESS;
+}
+
+bool SurfacelessEGL::Initialize() {
+  return Initialize(SURFACE_SURFACELESS);
 }
 
 bool SurfacelessEGL::Initialize(GLSurface::Format format) {
   format_ = format;
   return true;
 }
 
 void SurfacelessEGL::Destroy() {
 }
 
@@ skipping 26 matching lines @@
 }
 
 void* SurfacelessEGL::GetShareHandle() {
   return NULL;
 }
 
 SurfacelessEGL::~SurfacelessEGL() {
 }
 
 }  // namespace gfx