Ozone X11 platform

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"
 
 #if defined(OS_ANDROID)
 #include <android/native_window_jni.h>
 #endif
 
@@ skipping 152 matching lines @@
     EGL_GREEN_SIZE, 8,
     EGL_RED_SIZE, 8,
     EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
     EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
     EGL_NONE
   };
 
 #if defined(USE_OZONE)
   const EGLint* config_attribs =
       ui::SurfaceFactoryOzone::GetInstance()->GetEGLSurfaceProperties(
-          kConfigAttribs);
+          kConfigAttribs, nullptr);
 #else
   const EGLint* config_attribs = kConfigAttribs;
 #endif
 
   EGLint num_configs;
   if (!eglChooseConfig(g_display,
                        config_attribs,
                        NULL,
                        0,
                        &num_configs)) {
@@ skipping 147 matching lines @@
     return eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, native_display,
         kDisplayAttribsWarp);
   }
 
   return eglGetDisplay(native_display);
 }
 #endif
 
 NativeViewGLSurfaceEGL::NativeViewGLSurfaceEGL(EGLNativeWindowType window)
     : window_(window),
+      config_(NULL),
       surface_(NULL),
       supports_post_sub_buffer_(false),
-      config_(NULL),
       size_(1, 1) {
 #if defined(OS_ANDROID)
   if (window)
     ANativeWindow_acquire(window);
 #endif
 
 #if defined(OS_WIN)
   RECT windowRect;
   if (GetClientRect(window_, &windowRect))
     size_ = gfx::Rect(windowRect).size();
@@ skipping 406 matching lines @@
 }
 
 void* SurfacelessEGL::GetShareHandle() {
   return NULL;
 }
 
 SurfacelessEGL::~SurfacelessEGL() {
 }
 
 }  // namespace gfx