Ozone X11 platform

ui/ozone/platform/egltest/ozone_platform_egltest.cc

 // Copyright 2014 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/ozone/platform/egltest/ozone_platform_egltest.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
@@ skipping 217 matching lines @@
 class SurfaceFactoryEgltest : public ui::SurfaceFactoryOzone {
  public:
   SurfaceFactoryEgltest(LibeglplatformShimLoader* eglplatform_shim)
       : eglplatform_shim_(eglplatform_shim) {}
   ~SurfaceFactoryEgltest() override {}
 
   // SurfaceFactoryOzone:
   intptr_t GetNativeDisplay() override;
   scoped_ptr<SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
       gfx::AcceleratedWidget widget) override;
-  const int32* GetEGLSurfaceProperties(const int32* desired_list) override;
+  void* /* EGLConfig */ GetEGLSurfaceConfig(const EglConfigInfo& egl,
+                                            SurfaceOzoneEGL* surface) override;
+
   bool LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) override;
 
  private:
   LibeglplatformShimLoader* eglplatform_shim_;
 };
 
 intptr_t SurfaceFactoryEgltest::GetNativeDisplay() {
   return eglplatform_shim_->ShimGetNativeDisplay();
@@ skipping 13 matching lines @@
       eglplatform_shim_->ShimQueryString(SHIM_GLES_LIBRARY);
   if (!egl_soname)
     egl_soname = kDefaultEglSoname;
   if (!gles_soname)
     gles_soname = kDefaultGlesSoname;
 
   return ::ui::LoadEGLGLES2Bindings(add_gl_library, set_gl_get_proc_address,
                                     egl_soname, gles_soname);
 }
 
-const int32* SurfaceFactoryEgltest::GetEGLSurfaceProperties(
-    const int32* desired_list) {
+void* SurfaceFactoryEgltest::GetEGLSurfaceConfig(const EglConfigInfo& egl,
+                                                 SurfaceOzoneEGL* surface) {
   static const int32 broken_props[] = {
       EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
       EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
       EGL_NONE,
   };
-  return broken_props;
+  return ChooseEGLConfig(egl, broken_props);
 }
 
 // Test platform for EGL.
 //
 // This is a tiny EGL-based platform. Creation of the native window is
 // handled by a separate library called eglplatform_shim.so.1 because
 // this itself is platform specific and we want to test out multiple
 // hardware platforms.
 class OzonePlatformEgltest : public OzonePlatform {
  public:
@@ skipping 91 matching lines @@
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformEgltest() {
   OzonePlatformEgltest* platform = new OzonePlatformEgltest;
   platform->Initialize();
   return platform;
 }
 
 }  // namespace ui