Chromium Code Reviews| Index: webkit/media/webvideoframe_impl.h |
| diff --git a/webkit/media/webvideoframe_impl.h b/webkit/media/webvideoframe_impl.h |
| index 2f0103742557a028ec9a03ca30fd0ab75df8278d..79c350ef0b5d99fedcfbb9345ff85fb62d05ed9b 100644 |
| --- a/webkit/media/webvideoframe_impl.h |
| +++ b/webkit/media/webvideoframe_impl.h |
| @@ -15,7 +15,7 @@ class WebVideoFrameImpl : public WebKit::WebVideoFrame { |
| public: |
| // This converts a WebKit::WebVideoFrame to a media::VideoFrame. |
| static media::VideoFrame* toVideoFrame( |
| - WebKit::WebVideoFrame* web_video_frame); |
| + WebVideoFrame* web_video_frame); |
|
Ami GONE FROM CHROMIUM
2012/10/26 22:45:09
optional: Personally I find the previous version m
slavi
2012/10/26 23:46:23
Done.
|
| WebVideoFrameImpl(scoped_refptr<media::VideoFrame> video_frame); |
| virtual ~WebVideoFrameImpl(); |
| @@ -33,6 +33,15 @@ class WebVideoFrameImpl : public WebKit::WebVideoFrame { |
| DISALLOW_COPY_AND_ASSIGN(WebVideoFrameImpl); |
| }; |
| +inline media::VideoFrame* WebVideoFrameImpl::toVideoFrame( |
|
Ami GONE FROM CHROMIUM
2012/10/26 22:45:09
Why this thunk?
slavi
2012/10/26 23:46:23
Ok, this is subtle.
The problem is that I want to
|
| + 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_ |