wm: Fix an uncommon memory leak in the compositor code.

compositor/gles/opengles_visitor.cc

 // Copyright (c) 2010 The Chromium OS 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 "window_manager/compositor/gles/opengles_visitor.h"
 
 #include <X11/Xlib.h>
 #include <xcb/damage.h>
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
 #include "base/logging.h"
 #include "window_manager/compositor/gles/gles2_interface.h"
 #include "window_manager/compositor/gles/shaders.h"
 #include "window_manager/image_container.h"
 
 #ifndef COMPOSITOR_OPENGLES
 #error Need COMPOSITOR_OPENGLES defined to compile this file
 #endif
 
 namespace window_manager {
-  
+
 OpenGlesDrawVisitor::OpenGlesDrawVisitor(Gles2Interface* gl,
                                          RealCompositor* compositor,
                                          Compositor::StageActor* stage)
     : gl_(gl),
       compositor_(compositor),
       stage_(stage),
       x_connection_(compositor_->x_conn()),
       egl_surface_is_capable_of_partial_updates_(false),
       has_fullscreen_actor_(false),
       using_passthrough_projection_(false) {
@@ skipping 52 matching lines @@
                                        egl_context_attributes);
   CHECK(egl_context_ != EGL_NO_CONTEXT) << "Failed to create EGL context.";
 
   CHECK(gl_->EglMakeCurrent(egl_display_, egl_surface_, egl_surface_,
                             egl_context_))
       << "eglMakeCurrent() failed: " << eglGetError();
 
   CHECK(gl_->InitGLExtensions()) << "Failed to load GL-ES extensions.";
 
   // Allocate shaders
-  tex_color_shader_ = new TexColorShader();
-  tex_shade_shader_ = new TexShadeShader();
-  no_alpha_color_shader_ = new NoAlphaColorShader();
-  no_alpha_shade_shader_ = new NoAlphaShadeShader();
+  tex_color_shader_.reset(new TexColorShader());
+  tex_shade_shader_.reset(new TexShadeShader());
+  no_alpha_color_shader_.reset(new NoAlphaColorShader());
+  no_alpha_shade_shader_.reset(new NoAlphaShadeShader());
   gl_->ReleaseShaderCompiler();
 
   // TODO: Move away from one global Vertex Buffer Object
   gl_->GenBuffers(1, &vertex_buffer_object_);
   CHECK(vertex_buffer_object_ > 0) << "VBO allocation failed.";
   gl_->BindBuffer(GL_ARRAY_BUFFER, vertex_buffer_object_);
   static float kTriAndQuad[] = {
     // Triangle-strip quad.
     0.f, 0.f,
     0.f, 1.f,
     1.f, 0.f,
     1.f, 1.f,
 
     // Large Triangle
     0.f, 0.f,
     0.f, 2.f,
     2.f, 0.f,
   };
   gl_->BufferData(GL_ARRAY_BUFFER,
                   sizeof(kTriAndQuad), kTriAndQuad,
                   GL_STATIC_DRAW);
   quad_vertices_index_ = 0;
   tri_vertices_index_ = 4;
 
   // Unchanging state
   gl_->BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
 
 OpenGlesDrawVisitor::~OpenGlesDrawVisitor() {
-  delete tex_color_shader_;
-  delete tex_shade_shader_;
-  delete no_alpha_color_shader_;
-  delete no_alpha_shade_shader_;
-
   gl_->DeleteBuffers(1, &vertex_buffer_object_);
 
-  LOG_IF(ERROR, gl_->EglMakeCurrent(egl_display_, EGL_NO_SURFACE,
+  LOG_IF(ERROR, gl_->EglMakeCurrent(egl_display_,
+                                    EGL_NO_SURFACE,
                                     EGL_NO_SURFACE,
                                     EGL_NO_CONTEXT) != EGL_TRUE)
       << "eglMakeCurrent() failed: " << eglGetError();
   LOG_IF(ERROR, gl_->EglDestroySurface(egl_display_, egl_surface_) != EGL_TRUE)
       << "eglDestroySurface() failed: " << eglGetError();
   LOG_IF(ERROR, gl_->EglDestroyContext(egl_display_, egl_context_) != EGL_TRUE)
       << "eglDestroyCotnext() failed: " << eglGetError();
 }
 
 void OpenGlesDrawVisitor::BindImage(const ImageContainer* container,
@@ skipping 28 matching lines @@
   CHECK(texture > 0) << "Failed to allocated texture.";
   gl_->BindTexture(GL_TEXTURE_2D, texture);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   gl_->TexImage2D(GL_TEXTURE_2D, 0, gl_format,
                   container->width(), container->height(),
                   0, gl_format, gl_type, container->data());
 
-  OpenGlesTextureData* data = new OpenGlesTextureData(gl_);
+  scoped_ptr<OpenGlesTextureData> data(new OpenGlesTextureData(gl_));
   data->SetTexture(texture);
   data->set_has_alpha(ImageFormatUsesAlpha(container->format()));
-  actor->set_texture_data(data);
+  actor->set_texture_data(data.release());
 }
 
 void OpenGlesDrawVisitor::VisitStage(RealCompositor::StageActor* actor) {
   if (!actor->IsVisible())
     return;
 
   if (actor->stage_color_changed()) {
     const Compositor::Color& color = actor->stage_color();
     gl_->ClearColor(color.red, color.green, color.blue, 1.f);
     actor->unset_stage_color_changed();
@@ skipping 63 matching lines @@
   }
 }
 
 void OpenGlesDrawVisitor::CreateTextureData(
     RealCompositor::TexturePixmapActor* actor) const {
   OpenGlesEglImageData image_data(gl_);
 
   if (!image_data.Bind(actor))
     return;
 
-  OpenGlesTextureData* texture = new OpenGlesTextureData(gl_);
-  image_data.BindTexture(texture, !actor->pixmap_is_opaque());
-  actor->set_texture_data(texture);
+  scoped_ptr<OpenGlesTextureData> texture(new OpenGlesTextureData(gl_));
+  image_data.BindTexture(texture.get(), !actor->pixmap_is_opaque());
+  actor->set_texture_data(texture.release());
 }
 
 void OpenGlesDrawVisitor::VisitImage(RealCompositor::ImageActor* actor) {
   VisitQuad(actor);
 }
 
 void OpenGlesDrawVisitor::VisitTexturePixmap(
     RealCompositor::TexturePixmapActor* actor) {
   if (!actor->IsVisible())
     return;
@@ skipping 275 matching lines @@
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   gl_->EGLImageTargetTexture2DOES(GL_TEXTURE_2D,
                                   static_cast<GLeglImageOES>(egl_image_));
 
   texture_data->SetTexture(texture);
   texture_data->set_has_alpha(has_alpha);
 }
 
 }  // namespace window_manager