Fix EGL configs with GLSurfaceOzoneSurfaceless.

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 15 matching lines @@
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_stub.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/scoped_make_current.h"
 #include "ui/gl/sync_control_vsync_provider.h"
 
 #if defined(OS_ANDROID)
 #include <android/native_window_jni.h>
 #endif
 
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/surface_factory_ozone.h"
+#endif
+
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
 extern "C" {
 #include <X11/Xlib.h>
 #define Status int
 }
 #include "ui/base/x/x11_util_internal.h"
 #include "ui/gfx/x/x11_switches.h"
 #endif
 
 #if !defined(EGL_FIXED_SIZE_ANGLE)
@@ skipping 255 matching lines @@
     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_NONE
   };
   if (format == GLSurface::SURFACE_RGB565) {
     choose_attributes = config_attribs_565;
   }
 
+  const EGLint* config_attribs;
+#if defined(USE_OZONE)
+  config_attribs = ui::OzonePlatform::GetInstance()
+                       ->GetSurfaceFactoryOzone()
+                       ->GetEGLSurfaceProperties(choose_attributes);
+#else
+  config_attribs = choose_attributes;
+#endif
+
   EGLint num_configs;
   EGLint config_size = 1;
   EGLConfig config = nullptr;
   EGLConfig* config_data = &config;
   // Validate if there are any configs for given attribs.
-  if (!ValidateEglConfig(g_display, choose_attributes, &num_configs)) {
+  if (!ValidateEglConfig(g_display, config_attribs, &num_configs)) {
     return config;
   }
 
   scoped_ptr<EGLConfig[]> matching_configs(new EGLConfig[num_configs]);
   if (format == GLSurface::SURFACE_RGB565) {
     config_size = num_configs;
     config_data = matching_configs.get();
   }
 
-  if (!eglChooseConfig(g_display, choose_attributes, config_data, config_size,
+  if (!eglChooseConfig(g_display, config_attribs, config_data, config_size,
                        &num_configs)) {
     LOG(ERROR) << "eglChooseConfig failed with error "
                << GetLastEGLErrorString();
     return config;
   }
 
   if (format == GLSurface::SURFACE_RGB565) {
     // Because of the EGL config sort order, we have to iterate
     // through all of them (it'll put higher sum(R,G,B) bits
     // first with the above attribs).
@@ skipping 770 matching lines @@
 }
 
 void* SurfacelessEGL::GetShareHandle() {
   return NULL;
 }
 
 SurfacelessEGL::~SurfacelessEGL() {
 }
 
 }  // namespace gfx