| Index: ui/gl/gl_image_egl.cc
|
| diff --git a/ui/gl/gl_image_egl.cc b/ui/gl/gl_image_egl.cc
|
| index e52297ae72278a525b077cd3d72b9271739208c8..c7a48808c83cae8e56892a5ebae97fadcc3cd4fd 100644
|
| --- a/ui/gl/gl_image_egl.cc
|
| +++ b/ui/gl/gl_image_egl.cc
|
| @@ -12,7 +12,9 @@ GLImageEGL::GLImageEGL(const gfx::Size& size)
|
| : egl_image_(EGL_NO_IMAGE_KHR), size_(size) {
|
| }
|
|
|
| -GLImageEGL::~GLImageEGL() { Destroy(); }
|
| +GLImageEGL::~GLImageEGL() {
|
| + DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_);
|
| +}
|
|
|
| bool GLImageEGL::Initialize(EGLenum target,
|
| EGLClientBuffer buffer,
|
| @@ -32,7 +34,7 @@ bool GLImageEGL::Initialize(EGLenum target,
|
| return true;
|
| }
|
|
|
| -void GLImageEGL::Destroy() {
|
| +void GLImageEGL::Destroy(bool have_context) {
|
| if (egl_image_ != EGL_NO_IMAGE_KHR) {
|
| eglDestroyImageKHR(GLSurfaceEGL::GetHardwareDisplay(), egl_image_);
|
| egl_image_ = EGL_NO_IMAGE_KHR;
|
| @@ -42,7 +44,10 @@ void GLImageEGL::Destroy() {
|
| gfx::Size GLImageEGL::GetSize() { return size_; }
|
|
|
| bool GLImageEGL::BindTexImage(unsigned target) {
|
| - DCHECK_NE(EGL_NO_IMAGE_KHR, egl_image_);
|
| + if (egl_image_ == EGL_NO_IMAGE_KHR) {
|
| + LOG(ERROR) << "No EGLImage to bind";
|
| + return false;
|
| + }
|
| glEGLImageTargetTexture2DOES(target, egl_image_);
|
| DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
|
| return true;
|
|
|