Index: cc/video_layer.h |
diff --git a/cc/video_layer.h b/cc/video_layer.h |
index 25250792540ee758ae54eac2b9d786fc06c4bf41..3624f772270e57263754a0a61a94eaf256d8c882 100644 |
--- a/cc/video_layer.h |
+++ b/cc/video_layer.h |
@@ -9,36 +9,28 @@ |
#include "cc/cc_export.h" |
#include "cc/layer.h" |
-namespace WebKit { |
-class WebVideoFrame; |
-class WebVideoFrameProvider; |
-} |
- |
namespace media { |
class VideoFrame; |
} |
namespace cc { |
+class VideoFrameProvider; |
class VideoLayerImpl; |
// A Layer that contains a Video element. |
class CC_EXPORT VideoLayer : public Layer { |
public: |
- typedef base::Callback<media::VideoFrame* (WebKit::WebVideoFrame*)> FrameUnwrapper; |
- |
- static scoped_refptr<VideoLayer> create(WebKit::WebVideoFrameProvider*, |
- const FrameUnwrapper&); |
+ static scoped_refptr<VideoLayer> create(VideoFrameProvider*); |
virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl* treeImpl) OVERRIDE; |
private: |
- VideoLayer(WebKit::WebVideoFrameProvider*, const FrameUnwrapper&); |
+ VideoLayer(VideoFrameProvider*); |
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; |
+ VideoFrameProvider* m_provider; |
}; |
} // namespace cc |