cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

cc/layers/texture_layer_impl.cc

 // Copyright 2011 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 "cc/layers/texture_layer_impl.h"
 
+#include <vector>
+
 #include "base/strings/stringprintf.h"
 #include "cc/layers/quad_sink.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/platform_color.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
 
@@ skipping 12 matching lines @@
       own_mailbox_(false),
       valid_texture_copy_(false) {
   vertex_opacity_[0] = 1.0f;
   vertex_opacity_[1] = 1.0f;
   vertex_opacity_[2] = 1.0f;
   vertex_opacity_[3] = 1.0f;
 }
 
 TextureLayerImpl::~TextureLayerImpl() { FreeTextureMailbox(); }
 
-void TextureLayerImpl::SetTextureMailbox(const TextureMailbox& mailbox) {
+void TextureLayerImpl::SetTextureMailbox(
+    const TextureMailbox& mailbox,
+    ScopedReleaseCallback release_callback) {
   DCHECK(uses_mailbox_);
+  DCHECK_EQ(mailbox.IsValid(), !release_callback.IsEmpty());
   FreeTextureMailbox();
   texture_mailbox_ = mailbox;
+  release_callback_ = release_callback.Pass();
   own_mailbox_ = true;
   valid_texture_copy_ = false;
 }
 
 scoped_ptr<LayerImpl> TextureLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return TextureLayerImpl::Create(tree_impl, id(), uses_mailbox_).
       PassAs<LayerImpl>();
 }
 
 void TextureLayerImpl::PushPropertiesTo(LayerImpl* layer) {
   LayerImpl::PushPropertiesTo(layer);
 
   TextureLayerImpl* texture_layer = static_cast<TextureLayerImpl*>(layer);
   texture_layer->set_flipped(flipped_);
   texture_layer->set_uv_top_left(uv_top_left_);
   texture_layer->set_uv_bottom_right(uv_bottom_right_);
   texture_layer->set_vertex_opacity(vertex_opacity_);
   texture_layer->set_premultiplied_alpha(premultiplied_alpha_);
   if (uses_mailbox_ && own_mailbox_) {
-    texture_layer->SetTextureMailbox(texture_mailbox_);
+    texture_layer->SetTextureMailbox(texture_mailbox_,
+                                     release_callback_.Pass());
     own_mailbox_ = false;
   } else {
     texture_layer->set_texture_id(texture_id_);
   }
 }
 
 bool TextureLayerImpl::WillDraw(DrawMode draw_mode,
                                 ResourceProvider* resource_provider) {
   if (draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE)
     return false;
 
   if (uses_mailbox_) {
     if (own_mailbox_) {
       DCHECK(!external_texture_resource_);
       if ((draw_mode == DRAW_MODE_HARDWARE && texture_mailbox_.IsTexture()) ||
           (draw_mode == DRAW_MODE_SOFTWARE &&
            texture_mailbox_.IsSharedMemory())) {
         external_texture_resource_ =
             resource_provider->CreateResourceFromTextureMailbox(
-                texture_mailbox_);
+                texture_mailbox_,
+                release_callback_.Pass());
         DCHECK(external_texture_resource_);
         texture_copy_.reset();
         valid_texture_copy_ = false;
       }
       if (external_texture_resource_)
         own_mailbox_ = false;
     }
 
     if (!valid_texture_copy_ && draw_mode == DRAW_MODE_HARDWARE &&
         texture_mailbox_.IsSharedMemory()) {
@@ skipping 128 matching lines @@
 
 bool TextureLayerImpl::CanClipSelf() const {
   return true;
 }
 
 void TextureLayerImpl::FreeTextureMailbox() {
   if (!uses_mailbox_)
     return;
   if (own_mailbox_) {
     DCHECK(!external_texture_resource_);
-    texture_mailbox_.RunReleaseCallback(texture_mailbox_.sync_point(), false);
+    if (!release_callback_.IsEmpty())
+      release_callback_.RunAndReset(texture_mailbox_.sync_point(), false);
+    texture_mailbox_ = TextureMailbox();
   } else if (external_texture_resource_) {
     DCHECK(!own_mailbox_);
     ResourceProvider* resource_provider =
         layer_tree_impl()->resource_provider();
     resource_provider->DeleteResource(external_texture_resource_);
     external_texture_resource_ = 0;
   }
 }
 
 }  // namespace cc