cc: Move TextureMailbox::ReleaseCallback to SingleReleaseCallback.

cc/resources/video_resource_updater.h

 // Copyright 2013 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.
 
 #ifndef CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_
 #define CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/base/cc_export.h"
+#include "cc/resources/release_callback.h"
 #include "cc/resources/texture_mailbox.h"
 #include "ui/gfx/size.h"
 
 namespace media {
 class SkCanvasVideoRenderer;
 class VideoFrame;
 }
 
 namespace cc {
 class ContextProvider;
@@ skipping 16 matching lines @@
     HOLE,
 #endif
 
     // TODO(danakj): Remove this and abstract TextureMailbox into
     // "ExternalResource" that can hold a hardware or software backing.
     SOFTWARE_RESOURCE
   };
 
   ResourceType type;
   std::vector<TextureMailbox> mailboxes;
+  std::vector<ReleaseCallback> release_callbacks;
 
   // TODO(danakj): Remove these too.
   std::vector<unsigned> software_resources;
-  TextureMailbox::ReleaseCallback software_release_callback;
+  ReleaseCallback software_release_callback;
 
   VideoFrameExternalResources();
   ~VideoFrameExternalResources();
 };
 
 // VideoResourceUpdater is by the video system to produce frame content as
 // resources consumable by the compositor.
 class CC_EXPORT VideoResourceUpdater
     : public base::SupportsWeakPtr<VideoResourceUpdater> {
  public:
@@ skipping 45 matching lines @@
 
   std::vector<unsigned> all_resources_;
   std::vector<PlaneResource> recycled_resources_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoResourceUpdater);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_