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

compositor/mock_compositor.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/mock_compositor.h"
 
 #include "base/logging.h"
 #include "window_manager/image_container.h"
 #include "window_manager/util.h"
 #include "window_manager/x11/x_connection.h"
@@ skipping 128 matching lines @@
 }
 
 void MockCompositor::ImageActor::SetImageData(
     const ImageContainer& image_container) {
   SetSizeInternal(image_container.width(), image_container.height());
 }
 
 
 MockCompositor::TexturePixmapActor::TexturePixmapActor(XConnection* xconn)
     : xconn_(xconn),
-      alpha_mask_bytes_(NULL),
       pixmap_(0),
       num_texture_updates_(0),
       damaged_region_() {
   SetSizeInternal(0, 0);
 }
 
 MockCompositor::TexturePixmapActor::~TexturePixmapActor() {
-  ClearAlphaMask();
 }
 
 void MockCompositor::TexturePixmapActor::SetPixmap(XWindow pixmap) {
   pixmap_ = pixmap;
   XConnection::WindowGeometry geometry;
   if (xconn_->GetWindowGeometry(pixmap_, &geometry)) {
     SetSizeInternal(geometry.bounds.width, geometry.bounds.height);
   } else {
     SetSizeInternal(0, 0);
   }
 }
 
 void MockCompositor::TexturePixmapActor::SetAlphaMask(
     const uint8_t* bytes, int width, int height) {
   ClearAlphaMask();
   size_t size = width * height;
-  alpha_mask_bytes_ = new unsigned char[size];
-  memcpy(alpha_mask_bytes_, bytes, size);
+  alpha_mask_bytes_.reset(new uint8_t[size]);
+  memcpy(alpha_mask_bytes_.get(), bytes, size);
 }
 
 void MockCompositor::TexturePixmapActor::ClearAlphaMask() {
-  delete[] alpha_mask_bytes_;
-  alpha_mask_bytes_ = NULL;
+  alpha_mask_bytes_.reset();
 }
 
 MockCompositor::ImageActor* MockCompositor::CreateImageFromFile(
     const std::string& filename) {
   ImageActor* actor = new ImageActor;
   InMemoryImageContainer container(
       new uint8_t[1], 1, 1, IMAGE_FORMAT_RGBA_32, false);  // malloc=false
   actor->SetImageData(container);
   return actor;
 }
 
 void MockCompositor::TexturePixmapActor::MergeDamagedRegion(
     const Rect& region) {
   damaged_region_.merge(region);
 }
 
 const Rect& MockCompositor::TexturePixmapActor::GetDamagedRegion() const {
   return damaged_region_;
 }
 
 void MockCompositor::TexturePixmapActor::ResetDamagedRegion() {
   damaged_region_.reset(0, 0, 0, 0);
 }
 
 }  // namespace window_manager