VideoDecodeAccelerator now SupportsWeakPtr instead of being RefCountedThreadSafe.

content/common/gpu/media/mac_video_decode_accelerator.h

 // Copyright (c) 2012 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 CONTENT_COMMON_GPU_MEDIA_MAC_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_MAC_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <CoreVideo/CoreVideo.h>
 #include <map>
 #include <list>
@@ skipping 15 matching lines @@
 }
 
 class GpuCommandBufferStub;
 
 class CONTENT_EXPORT MacVideoDecodeAccelerator
     : public media::VideoDecodeAccelerator,
       public base::NonThreadSafe {
  public:
   // Does not take ownership of |client| which must outlive |*this|.
   MacVideoDecodeAccelerator(media::VideoDecodeAccelerator::Client* client);
+  virtual ~MacVideoDecodeAccelerator();
 
   // Set the OpenGL context to use.
   void SetCGLContext(CGLContextObj cgl_context);
 
   // media::VideoDecodeAccelerator implementation.
   virtual bool Initialize(media::VideoCodecProfile profile) OVERRIDE;
   virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
   virtual void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& buffers) OVERRIDE;
   virtual void ReusePictureBuffer(int32 picture_buffer_id) OVERRIDE;
   virtual void Flush() OVERRIDE;
   virtual void Reset() OVERRIDE;
   virtual void Destroy() OVERRIDE;
 
  private:
-  virtual ~MacVideoDecodeAccelerator();
 
   // Callback for a completed frame.
   void OnFrameReady(int32 bitstream_buffer_id,
                     scoped_refptr<base::RefCountedBytes> bytes,
                     CVImageBufferRef image,
                     int status);
 
   // Sends available decoded frames to the client.
   void SendImages();
 
@@ skipping 16 matching lines @@
   // Calls the client's flush completed callback.
   void NotifyFlushDone();
 
   // Calls the client's reset completed callback.
   void NotifyResetDone();
 
   // Notifies the client that the input buffer identifed by |input_buffer_id|
   // has been processed.
   void NotifyInputBufferRead(int input_buffer_id);
 
+  // Helper for Destroy(), doing all the actual work except for deleting self.
+  void Cleanup();
+
   // To expose client callbacks from VideoDecodeAccelerator.
   Client* client_;
   // C++ wrapper around the Mac VDA API.
   scoped_refptr<gfx::VideoDecodeAccelerationSupport> vda_support_;
   // Picture buffers that are available for use by the decoder to draw decoded
   // video frames on.
   std::list<media::PictureBuffer> available_pictures_;
 
   // Maps ids to picture buffers that are in use by the client.
   struct UsedPictureInfo {
@@ skipping 26 matching lines @@
   // Utility to build the AVC configuration record.
   content::AVCConfigRecordBuilder config_record_builder_;
 
   // Maps a bitstream ID to the number of NALUs that are being decoded for
   // that bitstream. This is used to ensure that NotifyEndOfBitstreamBuffer()
   // is called after all NALUs contained in a bitstream have been decoded.
   std::map<int32, int> bitstream_nalu_count_;
 };
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VIDEO_DECODE_ACCELERATOR_MAC_H_