| Index: media/base/video_frame.h
|
| diff --git a/media/base/video_frame.h b/media/base/video_frame.h
|
| index ad7f4c01a4268651728ce71acba87c3ec0ac388e..8f1ea117cc0e3b568c23abd8793d3079836ed8c0 100644
|
| --- a/media/base/video_frame.h
|
| +++ b/media/base/video_frame.h
|
| @@ -15,6 +15,7 @@
|
| #include "base/macros.h"
|
| #include "base/md5.h"
|
| #include "base/memory/shared_memory.h"
|
| +#include "base/supports_user_data.h"
|
| #include "base/synchronization/lock.h"
|
| #include "build/build_config.h"
|
| #include "gpu/command_buffer/common/mailbox_holder.h"
|
| @@ -31,7 +32,8 @@
|
|
|
| namespace media {
|
|
|
| -class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
|
| +class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame>,
|
| + public base::SupportsUserData {
|
| public:
|
| enum {
|
| kFrameSizeAlignment = 16,
|
| @@ -451,7 +453,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
|
| const gpu::MailboxHolder(&mailbox_holders)[kMaxPlanes],
|
| const ReleaseMailboxCB& mailbox_holder_release_cb,
|
| base::TimeDelta timestamp);
|
| - virtual ~VideoFrame();
|
| + ~VideoFrame() override;
|
|
|
| static scoped_refptr<VideoFrame> CreateFrameInternal(
|
| VideoPixelFormat format,
|
|
|