Index: webkit/media/webvideoframe_impl.h |
=================================================================== |
--- webkit/media/webvideoframe_impl.h (revision 113907) |
+++ webkit/media/webvideoframe_impl.h (working copy) |
@@ -19,13 +19,12 @@ |
WebVideoFrameImpl(scoped_refptr<media::VideoFrame> video_frame); |
virtual ~WebVideoFrameImpl(); |
- virtual WebVideoFrame::Format format() const; |
- virtual unsigned width() const; |
- virtual unsigned height() const; |
- virtual unsigned planes() const; |
- virtual int stride(unsigned plane) const; |
- virtual const void* data(unsigned plane) const; |
- virtual unsigned textureId() const; |
+ virtual WebVideoFrame::Format format() const OVERRIDE; |
+ virtual unsigned width() const OVERRIDE; |
+ virtual unsigned height() const OVERRIDE; |
+ virtual unsigned planes() const OVERRIDE; |
+ virtual int stride(unsigned plane) const OVERRIDE; |
+ virtual const void* data(unsigned plane) const OVERRIDE; |
private: |
scoped_refptr<media::VideoFrame> video_frame_; |
Property changes on: webkit/media/webvideoframe_impl.h |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/src/webkit/media/webvideoframe_impl.h:r3734-4217,4606-5108,5177-5263 |