Android: Use virtualized context only for those with compatible config

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>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.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/sys_info.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_image.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"
@@ skipping 400 matching lines @@
   }
 
   // If no displays are available due to missing angle extensions or invalid
   // flags, request the default display.
   if (init_displays->empty()) {
     init_displays->push_back(DEFAULT);
   }
 }
 
 GLSurfaceEGL::GLSurfaceEGL() :
-    config_(nullptr),
-    format_(SURFACE_DEFAULT) {}
+    GLSurface(),
+    config_(nullptr) {}
 
 bool GLSurfaceEGL::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
   InitializeDisplay();
   if (g_display == EGL_NO_DISPLAY)
     return false;
 
@@ skipping 81 matching lines @@
 }
 
 bool GLSurfaceEGL::IsEGLSurfacelessContextSupported() {
   return g_egl_surfaceless_context_supported;
 }
 
 bool GLSurfaceEGL::IsDirectCompositionSupported() {
   return g_use_direct_composition;
 }
 
+GLSurface::Format GLSurfaceEGL::GetDefaultFormat() const {
+  return base::SysInfo::IsLowEndDevice() ? SURFACE_RGB565 : SURFACE_ARGB8888;

[no sievers, 2016/02/18 20:19:45]

wherever we override this, it needs #ifdef ANDROID since these EGL classes +
context virtualization are also used on ChromeOS+ARM.

[Jinsuk Kim, 2016/02/19 01:04:40]

Done. Moved it to PbufferGLSurafceEGL::Initialize().

+}
+
 GLSurfaceEGL::~GLSurfaceEGL() {}
 
 // InitializeDisplay is necessary because the static binding code
 // needs a full Display init before it can query the Display extensions.
 // static
 EGLDisplay GLSurfaceEGL::InitializeDisplay() {
   if (g_display != EGL_NO_DISPLAY) {
     return g_display;
   }
 
@@ skipping 60 matching lines @@
 
 #if defined(OS_WIN)
   vsync_override_ = false;
   swap_generation_ = 0;
   RECT windowRect;
   if (GetClientRect(window_, &windowRect))
     size_ = gfx::Rect(windowRect).size();
 #endif
 }
 
-bool NativeViewGLSurfaceEGL::Initialize() {
-  return Initialize(SURFACE_DEFAULT);
-}
-
 bool NativeViewGLSurfaceEGL::Initialize(GLSurface::Format format) {
   format_ = format;
   return Initialize(nullptr);
 }
 
 bool NativeViewGLSurfaceEGL::Initialize(
     scoped_ptr<VSyncProvider> sync_provider) {
   DCHECK(!surface_);
 
   if (!GetDisplay()) {
@@ skipping 462 matching lines @@
 }
 
 void* SurfacelessEGL::GetShareHandle() {
   return NULL;
 }
 
 SurfacelessEGL::~SurfacelessEGL() {
 }
 
 }  // namespace gfx