Index: webkit/media/webvideoframe_impl.h |
diff --git a/webkit/media/webvideoframe_impl.h b/webkit/media/webvideoframe_impl.h |
index b2eed0c4edcfc4d91c8202a9e23fcdfed08d2874..eee657a39ca70c7c45412df73a38f92e86c08ff7 100644 |
--- a/webkit/media/webvideoframe_impl.h |
+++ b/webkit/media/webvideoframe_impl.h |
@@ -6,45 +6,26 @@ |
#define WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_ |
#include "base/compiler_specific.h" |
-#include "media/base/video_frame.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" |
+#include "base/memory/ref_counted.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" |
+namespace media { |
+class VideoFrame; |
+} |
+ |
namespace webkit_media { |
class WebVideoFrameImpl : public WebKit::WebVideoFrame { |
public: |
- // This converts a WebKit::WebVideoFrame to a media::VideoFrame. |
- static media::VideoFrame* toVideoFrame( |
- WebKit::WebVideoFrame* web_video_frame); |
- |
WebVideoFrameImpl(scoped_refptr<media::VideoFrame> video_frame); |
virtual ~WebVideoFrameImpl(); |
- virtual WebVideoFrame::Format format() const; |
- virtual unsigned planes() const; |
- virtual const void* data(unsigned plane) const; |
- virtual unsigned textureId() const; |
- virtual unsigned textureTarget() const; |
- virtual WebKit::WebRect visibleRect() const; |
- virtual WebKit::WebSize textureSize() const; |
+ |
+ scoped_refptr<media::VideoFrame> video_frame; |
private: |
- scoped_refptr<media::VideoFrame> video_frame_; |
DISALLOW_COPY_AND_ASSIGN(WebVideoFrameImpl); |
}; |
-// TODO(skaslev) This is temporarily inline pending the removal of |
-// WebKit::WebVideoFrame and WebVideoFrameImpl which are currently unused. |
-inline media::VideoFrame* WebVideoFrameImpl::toVideoFrame( |
- WebKit::WebVideoFrame* web_video_frame) { |
- WebVideoFrameImpl* wrapped_frame = |
- static_cast<WebVideoFrameImpl*>(web_video_frame); |
- if (wrapped_frame) |
- return wrapped_frame->video_frame_.get(); |
- return NULL; |
-} |
- |
} // namespace webkit_media |
#endif // WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_ |