Chromium Code Reviews| Index: ui/gl/gl_surface_egl.cc |
| diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc |
| index 081ffa546ee58e12e5a4c559e22b1043c24b4691..9829264810a328637b3928e015ce8009b61fa0b2 100644 |
| --- a/ui/gl/gl_surface_egl.cc |
| +++ b/ui/gl/gl_surface_egl.cc |
| @@ -16,6 +16,7 @@ |
| #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" |
| @@ -436,8 +437,8 @@ void GetEGLInitDisplays(bool supports_angle_d3d, |
| } |
| GLSurfaceEGL::GLSurfaceEGL() : |
| - config_(nullptr), |
| - format_(SURFACE_DEFAULT) {} |
| + GLSurface(), |
|
no sievers
2016/02/19 20:25:18
nit: not needed
Jinsuk Kim
2016/02/20 13:56:57
Done.
|
| + config_(nullptr) {} |
| bool GLSurfaceEGL::InitializeOneOff() { |
| static bool initialized = false; |
| @@ -619,10 +620,6 @@ NativeViewGLSurfaceEGL::NativeViewGLSurfaceEGL(EGLNativeWindowType window) |
| #endif |
| } |
| -bool NativeViewGLSurfaceEGL::Initialize() { |
| - return Initialize(SURFACE_DEFAULT); |
| -} |
| - |
| bool NativeViewGLSurfaceEGL::Initialize(GLSurface::Format format) { |
| format_ = format; |
| return Initialize(nullptr); |
| @@ -935,6 +932,15 @@ PbufferGLSurfaceEGL::PbufferGLSurfaceEGL(const gfx::Size& size) |
| size_.SetSize(1, 1); |
| } |
| +bool PbufferGLSurfaceEGL::Initialize() { |
| + GLSurface::Format format = SURFACE_DEFAULT; |
| +#if defined(OS_ANDROID) |
| + if (base::SysInfo::IsLowEndDevice()) |
| + format = SURFACE_RGB565; |
| +#endif |
| + return Initialize(format); |
| +} |
| + |
| bool PbufferGLSurfaceEGL::Initialize(GLSurface::Format format) { |
| EGLSurface old_surface = surface_; |
| format_ = format; |