gl_surface_egl: ensure off and on screen surfaces use the same EGLConfig

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
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gl/egl_util.h"
 #include "ui/gl/gl_context.h"
 #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(USE_X11)
 extern "C" {
 #include <X11/Xlib.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)
+#include "ui/gfx/x/x11_switches.h"
+#endif
+
 #if !defined(EGL_FIXED_SIZE_ANGLE)
 #define EGL_FIXED_SIZE_ANGLE 0x3201
 #endif
 
 #if !defined(EGL_OPENGL_ES3_BIT)
 #define EGL_OPENGL_ES3_BIT 0x00000040
 #endif
 
 // From ANGLE's egl/eglext.h.
 
@@ skipping 218 matching lines @@
   if (g_display == EGL_NO_DISPLAY)
     return false;
 
   // Choose an EGL configuration.
   // On X this is only used for PBuffer surfaces.
   EGLint renderable_type = EGL_OPENGL_ES2_BIT;
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableUnsafeES3APIs)) {
     renderable_type = EGL_OPENGL_ES3_BIT;
   }
+
+  EGLint buffer_size = 32;
+  EGLint alpha_size = 8;
+
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
+  bool succeed =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kWindowDepth);
+  DCHECK(succeed);

[piman, 2015/11/20 01:44:41]

This code may be called outside of the full chrome, e.g. in tests. kWindowDepth
may not be there.

[Julien Isorce Samsung, 2015/11/20 09:13:56]

Ah ok, thx. At minimum I'll add a if.

+
+  std::string depth =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kWindowDepth);
+  succeed = base::StringToInt(depth, &buffer_size);
+  DCHECK(succeed);
+
+  alpha_size = buffer_size == 32 ? 8 : 0;
+#endif
+
   const EGLint kConfigAttribs[] = {
-    EGL_BUFFER_SIZE, 32,
-    EGL_ALPHA_SIZE, 8,
+    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_NONE
   };
 
 #if defined(USE_OZONE)
   const EGLint* config_attribs = ui::OzonePlatform::GetInstance()
@@ skipping 625 matching lines @@
 }
 
 void* SurfacelessEGL::GetShareHandle() {
   return NULL;
 }
 
 SurfacelessEGL::~SurfacelessEGL() {
 }
 
 }  // namespace gfx