| Index: cc/video_layer.h
|
| diff --git a/cc/video_layer.h b/cc/video_layer.h
|
| index 5d71fff8d4b26b363f57db30ca2343d49470319a..756c5022e5f906192b5ccd15489061a4621710bb 100644
|
| --- a/cc/video_layer.h
|
| +++ b/cc/video_layer.h
|
| @@ -5,12 +5,18 @@
|
| #ifndef VideoLayerChromium_h
|
| #define VideoLayerChromium_h
|
|
|
| +#include "base/callback.h"
|
| #include "cc/layer.h"
|
|
|
| namespace WebKit {
|
| +class WebVideoFrame;
|
| class WebVideoFrameProvider;
|
| }
|
|
|
| +namespace media {
|
| +class VideoFrame;
|
| +}
|
| +
|
| namespace cc {
|
|
|
| class VideoLayerImpl;
|
| @@ -18,17 +24,22 @@ class VideoLayerImpl;
|
| // A Layer that contains a Video element.
|
| class VideoLayer : public Layer {
|
| public:
|
| - static scoped_refptr<VideoLayer> create(WebKit::WebVideoFrameProvider*);
|
| + typedef base::Callback<media::VideoFrame* (WebKit::WebVideoFrame*)> FrameUnwrapper;
|
| +
|
| + static scoped_refptr<VideoLayer> create(WebKit::WebVideoFrameProvider*,
|
| + const FrameUnwrapper&);
|
|
|
| virtual scoped_ptr<LayerImpl> createLayerImpl() OVERRIDE;
|
|
|
| private:
|
| - explicit VideoLayer(WebKit::WebVideoFrameProvider*);
|
| + VideoLayer(WebKit::WebVideoFrameProvider*, const FrameUnwrapper&);
|
| virtual ~VideoLayer();
|
|
|
| // This pointer is only for passing to VideoLayerImpl's constructor. It should never be dereferenced by this class.
|
| WebKit::WebVideoFrameProvider* m_provider;
|
| + FrameUnwrapper m_unwrapper;
|
| };
|
|
|
| -}
|
| +} // namespace cc
|
| +
|
| #endif
|
|
|