Send hardware video frames with mailboxes.

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"
@@ skipping 29 matching lines @@
 #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;
 
-  // TODO(danakj): Remove these when we get a Mailbox from VideoFrame.
-  unsigned hardware_resource;
-  TextureMailbox::ReleaseCallback hardware_release_callback;
-
   // TODO(danakj): Remove these too.
   std::vector<unsigned> software_resources;
   TextureMailbox::ReleaseCallback software_release_callback;
 
   VideoFrameExternalResources();
   ~VideoFrameExternalResources();
 };
 
 // VideoResourceUpdater is by the video system to produce frame content as
 // resources consumable by the compositor.
 class VideoResourceUpdater
     : public base::SupportsWeakPtr<VideoResourceUpdater> {
  public:
   explicit VideoResourceUpdater(ResourceProvider* resource_provider);
   ~VideoResourceUpdater();
 
-  VideoFrameExternalResources CreateForHardwarePlanes(
-      const scoped_refptr<media::VideoFrame>& video_frame);
-
-  VideoFrameExternalResources CreateForSoftwarePlanes(
+  VideoFrameExternalResources CreateExternalResourcesFromVideoFrame(
       const scoped_refptr<media::VideoFrame>& video_frame);
 
  private:
   struct PlaneResource {
     unsigned resource_id;
     gfx::Size resource_size;
     unsigned resource_format;
     unsigned sync_point;
 
     PlaneResource(unsigned resource_id,
                   gfx::Size resource_size,
                   unsigned resource_format,
                   unsigned sync_point)
         : resource_id(resource_id),
           resource_size(resource_size),
           resource_format(resource_format),
           sync_point(sync_point) {}
   };
 
   bool VerifyFrame(const scoped_refptr<media::VideoFrame>& video_frame);
+  VideoFrameExternalResources CreateForHardwarePlanes(
+      const scoped_refptr<media::VideoFrame>& video_frame);
+  VideoFrameExternalResources CreateForSoftwarePlanes(
+      const scoped_refptr<media::VideoFrame>& video_frame);
 
   struct RecycleResourceData {
     unsigned resource_id;
     gfx::Size resource_size;
     unsigned resource_format;
     gpu::Mailbox mailbox;
   };
   static void RecycleResource(base::WeakPtr<VideoResourceUpdater> updater,
                               ResourceProvider* resource_provider,
                               RecycleResourceData data,
                               unsigned sync_point,
                               bool lost_resource);
-  static void ReturnTexture(ResourceProvider* resource_provider,
-                            unsigned resource_id,
+  static void ReturnTexture(scoped_refptr<media::VideoFrame> video_frame,
                             unsigned sync_point,
                             bool lost_resource);
 
   ResourceProvider* resource_provider_;
   scoped_ptr<media::SkCanvasVideoRenderer> video_renderer_;
 
   std::vector<PlaneResource> recycled_resources_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoResourceUpdater);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_VIDEO_RESOURCE_UPDATER_H_