Fix several leaks in the Sky compositor

sky/compositor/resource_manager.cc

 // Copyright 2014 The Chromium 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 "sky/compositor/resource_manager.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
 #include "base/logging.h"
+#include "base/stl_util.h"
 #include "gpu/GLES2/gl2chromium.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/gpu/gl_context.h"
 #include "mojo/gpu/gl_texture.h"
 #include "mojo/public/c/gles2/gles2.h"
 #include "sky/compositor/layer.h"
 
 namespace sky {
 
 ResourceManager::ResourceManager(base::WeakPtr<mojo::GLContext> gl_context)
     : gl_context_(gl_context), next_resource_id_(0) {
 }
 
 ResourceManager::~ResourceManager() {
+  STLDeleteContainerPairSecondPointers(resource_to_texture_map_.begin(),
+                             resource_to_texture_map_.end());

[ojan, 2014/11/25 19:27:47]

git cl format plz

 }
 
 scoped_ptr<mojo::GLTexture> ResourceManager::CreateTexture(
     const gfx::Size& size) {
   gl_context_->MakeCurrent();
   return make_scoped_ptr(new mojo::GLTexture(
       gl_context_, mojo::TypeConverter<mojo::Size, gfx::Size>::Convert(size)));
 }
 
 mojo::TransferableResourcePtr ResourceManager::CreateTransferableResource(
@@ skipping 29 matching lines @@
 }
 
 void ResourceManager::ReturnResources(
     mojo::Array<mojo::ReturnedResourcePtr> resources) {
   DCHECK(resources.size());
 
   gl_context_->MakeCurrent();
   for (size_t i = 0u; i < resources.size(); ++i) {
     mojo::ReturnedResourcePtr resource = resources[i].Pass();
     DCHECK_EQ(1, resource->count);
+    auto iter = resource_to_texture_map_.find(resource->id);
+    if (iter == resource_to_texture_map_.end())
+      continue;
+    mojo::GLTexture* texture = iter->second;
+    DCHECK_NE(0u, texture->texture_id());
+    resource_to_texture_map_.erase(iter);
+    // TODO(abarth): Consider recycling the texture.
     glWaitSyncPointCHROMIUM(resource->sync_point);
-    mojo::GLTexture* texture = resource_to_texture_map_[resource->id];
-    DCHECK_NE(0u, texture->texture_id());
-    resource_to_texture_map_.erase(resource->id);
-    // TODO(abarth): Consider recycling the texture.
     delete texture;
   }
 }
 
 }  // namespace examples