| Index: ui/gl/gl_image_surface_texture.cc
|
| diff --git a/ui/gl/gl_image_surface_texture.cc b/ui/gl/gl_image_surface_texture.cc
|
| index bb9fa135e1e718a26472c945f6aa68ee3991c4fc..76f6c29e91228579445714303438ce9e0042382c 100644
|
| --- a/ui/gl/gl_image_surface_texture.cc
|
| +++ b/ui/gl/gl_image_surface_texture.cc
|
| @@ -14,7 +14,10 @@ GLImageSurfaceTexture::GLImageSurfaceTexture(const gfx::Size& size)
|
| : size_(size), texture_id_(0) {
|
| }
|
|
|
| -GLImageSurfaceTexture::~GLImageSurfaceTexture() { Destroy(); }
|
| +GLImageSurfaceTexture::~GLImageSurfaceTexture() {
|
| + DCHECK(!surface_texture_);
|
| + DCHECK_EQ(0u, texture_id_);
|
| +}
|
|
|
| bool GLImageSurfaceTexture::Initialize(
|
| const gfx::GpuMemoryBufferHandle& handle) {
|
| @@ -26,7 +29,7 @@ bool GLImageSurfaceTexture::Initialize(
|
| return !!surface_texture_;
|
| }
|
|
|
| -void GLImageSurfaceTexture::Destroy() {
|
| +void GLImageSurfaceTexture::Destroy(bool have_context) {
|
| surface_texture_ = NULL;
|
| texture_id_ = 0;
|
| }
|
| @@ -51,7 +54,10 @@ bool GLImageSurfaceTexture::BindTexImage(unsigned target) {
|
| return false;
|
| }
|
|
|
| - DCHECK(surface_texture_);
|
| + if (!surface_texture_) {
|
| + LOG(ERROR) << "No SurfaceTexture Image memory to bind";
|
| + return false;
|
| + }
|
| if (texture_id != texture_id_) {
|
| // Note: Surface textures used as gpu memory buffers are created with an
|
| // initial dummy texture id of 0. We need to call DetachFromGLContext() here
|
|
|