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 11 matching lines @@
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/scoped_make_current.h"
 #include "ui/gl/sync_control_vsync_provider.h"
 
 #if defined(USE_X11)
 extern "C" {
 #include <X11/Xlib.h>
 }
 #endif
 
-#if defined (USE_OZONE)
-#include "ui/ozone/public/surface_factory_ozone.h"
-#endif
-
 #if !defined(EGL_FIXED_SIZE_ANGLE)
 #define EGL_FIXED_SIZE_ANGLE 0x3201
 #endif
 
 #if defined(OS_WIN)
 // From ANGLE's egl/eglext.h.
 #if !defined(EGL_PLATFORM_ANGLE_ANGLE)
 #define EGL_PLATFORM_ANGLE_ANGLE 0x3201
 #endif
 #if !defined(EGL_PLATFORM_ANGLE_TYPE_ANGLE)
@@ skipping 114 matching lines @@
     EGL_BUFFER_SIZE, 32,
     EGL_ALPHA_SIZE, 8,
     EGL_BLUE_SIZE, 8,
     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);
-#else
-  const EGLint* config_attribs = kConfigAttribs;
-#endif
-
   EGLint num_configs;
-  if (!eglChooseConfig(g_display,
-                       config_attribs,
-                       NULL,
-                       0,
-                       &num_configs)) {
+  if (!eglChooseConfig(g_display, kConfigAttribs, NULL, 0, &num_configs)) {
     LOG(ERROR) << "eglChooseConfig failed with error "
                << GetLastEGLErrorString();
     return false;
   }
 
   if (num_configs == 0) {
     LOG(ERROR) << "No suitable EGL configs found.";
     return false;
   }
 
-  if (!eglChooseConfig(g_display,
-                       config_attribs,
-                       &g_config,
-                       1,
-                       &num_configs)) {
+  if (!eglChooseConfig(g_display, kConfigAttribs, &g_config, 1, &num_configs)) {
     LOG(ERROR) << "eglChooseConfig failed with error "
                << GetLastEGLErrorString();
     return false;
   }
 
   g_egl_extensions = eglQueryString(g_display, EGL_EXTENSIONS);
   g_egl_create_context_robustness_supported =
       HasEGLExtension("EGL_EXT_create_context_robustness");
   g_egl_sync_control_supported =
       HasEGLExtension("EGL_CHROMIUM_sync_control");
@@ skipping 122 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