| Index: content/common/gpu/media/mac_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/mac_video_decode_accelerator.h b/content/common/gpu/media/mac_video_decode_accelerator.h
|
| index 55cb55bc250129ec8a64998360c60e994f968eca..2aa3830b5dcf9dd9e750d8ea36711b43866908ca 100644
|
| --- a/content/common/gpu/media/mac_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/mac_video_decode_accelerator.h
|
| @@ -33,6 +33,7 @@ class CONTENT_EXPORT MacVideoDecodeAccelerator
|
| 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);
|
| @@ -48,7 +49,6 @@ class CONTENT_EXPORT MacVideoDecodeAccelerator
|
| virtual void Destroy() OVERRIDE;
|
|
|
| private:
|
| - virtual ~MacVideoDecodeAccelerator();
|
|
|
| // Callback for a completed frame.
|
| void OnFrameReady(int32 bitstream_buffer_id,
|
| @@ -85,6 +85,9 @@ class CONTENT_EXPORT MacVideoDecodeAccelerator
|
| // 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.
|
|
|