| Index: gpu/gles2_conform_support/egl/surface.cc
|
| diff --git a/gpu/gles2_conform_support/egl/surface.cc b/gpu/gles2_conform_support/egl/surface.cc
|
| index 423fe2756f65cb39f65ecff797ffdd3ec73919b6..726d75349c561346ec26c7d26a338dc1466cfb53 100644
|
| --- a/gpu/gles2_conform_support/egl/surface.cc
|
| +++ b/gpu/gles2_conform_support/egl/surface.cc
|
| @@ -3,13 +3,46 @@
|
| // found in the LICENSE file.
|
|
|
| #include "gpu/gles2_conform_support/egl/surface.h"
|
| +#include "ui/gl/gl_surface.h"
|
|
|
| namespace egl {
|
|
|
| -Surface::Surface(EGLNativeWindowType win) : window_(win) {
|
| -}
|
| +Surface::Surface(gfx::GLSurface* gl_surface, const Config* config)
|
| + : is_current_in_some_thread_(false),
|
| + gl_surface_(gl_surface),
|
| + config_(config) {}
|
|
|
| Surface::~Surface() {
|
| }
|
|
|
| +gfx::GLSurface* Surface::gl_surface() const {
|
| + return gl_surface_.get();
|
| +}
|
| +
|
| +const Config* Surface::config() const {
|
| + return config_;
|
| +}
|
| +
|
| +bool Surface::ValidatePbufferAttributeList(const EGLint* attrib_list) {
|
| + if (attrib_list) {
|
| + for (int i = 0; attrib_list[i] != EGL_NONE; i += 2) {
|
| + switch (attrib_list[i]) {
|
| + case EGL_WIDTH:
|
| + case EGL_HEIGHT:
|
| + break;
|
| + default:
|
| + return false;
|
| + }
|
| + }
|
| + }
|
| + return true;
|
| +}
|
| +
|
| +bool Surface::ValidateWindowAttributeList(const EGLint* attrib_list) {
|
| + if (attrib_list) {
|
| + if (attrib_list[0] != EGL_NONE)
|
| + return false;
|
| + }
|
| + return true;
|
| +}
|
| } // namespace egl
|
|
|