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

compositor/gl/opengl_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/gl/opengl_visitor.h"
 
 #include <sys/time.h>
 
 #include <algorithm>
 #include <ctime>
@@ skipping 418 matching lines @@
                                GL_TEXTURE_WRAP_S,
                                GL_CLAMP_TO_EDGE);
   gl_interface_->TexParameterf(GL_TEXTURE_2D,
                                GL_TEXTURE_WRAP_T,
                                GL_CLAMP_TO_EDGE);
   gl_interface_->TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
                             container->width(), container->height(),
                             0, pixel_data_format, GL_UNSIGNED_BYTE,
                             container->data());
   CHECK_GL_ERROR(gl_interface_);
-  OpenGlTextureData* data = new OpenGlTextureData(gl_interface_);
+  scoped_ptr<OpenGlTextureData> data(new OpenGlTextureData(gl_interface_));
   data->SetTexture(new_texture);
   data->set_has_alpha(ImageFormatUsesAlpha(container->format()));
-  actor->set_texture_data(data);
+  actor->set_texture_data(data.release());
 }
 
 void OpenGlDrawVisitor::VisitImage(RealCompositor::ImageActor* actor) {
   if (!actor->IsVisible())
     return;
 
   PROFILER_MARKER_BEGIN(VisitImage);
 
   // All ImageActors are also QuadActors, and so we let the
   // QuadActor do all the actual drawing.
   VisitQuad(actor);
   PROFILER_MARKER_END(VisitImage);
 }
 
 void OpenGlDrawVisitor::VisitTexturePixmap(
     RealCompositor::TexturePixmapActor* actor) {
   if (!actor->IsVisible())
     return;
 
   PROFILER_MARKER_BEGIN(VisitTexturePixmap);
 
   // Make sure there's a bound texture.
   if (!actor->texture_data()) {
     if (!actor->pixmap()) {
       PROFILER_MARKER_END(VisitTexturePixmap);
       return;
     }
 
-    OpenGlPixmapData* data = new OpenGlPixmapData(this);
+    scoped_ptr<OpenGlPixmapData> data(new OpenGlPixmapData(this));
     if (!data->Init(actor)) {
       PROFILER_MARKER_END(VisitTexturePixmap);
       return;
     }
     data->set_has_alpha(!actor->pixmap_is_opaque());
-    actor->set_texture_data(data);
+    actor->set_texture_data(data.release());
   }
 
   // All texture pixmaps are also QuadActors, and so we let the
   // QuadActor do all the actual drawing.
   VisitQuad(actor);
   PROFILER_MARKER_END(VisitTexturePixmap);
 }
 
 void OpenGlDrawVisitor::VisitQuad(RealCompositor::QuadActor* actor) {
   if (!actor->IsVisible())
@@ skipping 222 matching lines @@
        ++iterator) {
     RealCompositor::Actor* child = *iterator;
     if (!child->IsVisible())
       continue;
 #ifdef EXTRA_LOGGING
     DLOG(INFO) << "Drawing child " << child->name()
                << " (visible: " << child->IsVisible()
                << ", opacity: " << child->opacity()
                << ", is_opaque: " << child->is_opaque() << ")";
 #endif
-  
+
     // TODO: move this down into the Visit* functions
     if (child->is_opaque() && child->opacity() * ancestor_opacity_ > 0.999)
       gl_interface_->Disable(GL_BLEND);
     else
       gl_interface_->Enable(GL_BLEND);
     child->Accept(this);
     CHECK_GL_ERROR(gl_interface_);
   }
 
   // Reset ancestor opacity.
   ancestor_opacity_ = original_opacity;
 }
 
 }  // namespace window_manager