Chromium Code Reviews| Index: cc/layers/video_layer_impl.h |
| diff --git a/cc/layers/video_layer_impl.h b/cc/layers/video_layer_impl.h |
| index dd09589b5d72e6fa8f5d1e098e2a916f85aa8af8..53199fbb577c7a9d21b9e15dc6a1b5c2d242b8c0 100644 |
| --- a/cc/layers/video_layer_impl.h |
| +++ b/cc/layers/video_layer_impl.h |
| @@ -11,6 +11,7 @@ |
| #include "cc/layers/layer_impl.h" |
| #include "cc/resources/release_callback.h" |
| #include "cc/resources/video_resource_updater.h" |
| +#include "media/base/video_rotation.h" |
| namespace media { |
| class VideoFrame; |
| @@ -24,7 +25,8 @@ class CC_EXPORT VideoLayerImpl : public LayerImpl { |
| public: |
| static scoped_ptr<VideoLayerImpl> Create(LayerTreeImpl* tree_impl, |
| int id, |
| - VideoFrameProvider* provider); |
| + VideoFrameProvider* provider, |
| + media::VideoRotation video_rotation); |
| virtual ~VideoLayerImpl(); |
| // LayerImpl implementation. |
| @@ -45,8 +47,12 @@ class CC_EXPORT VideoLayerImpl : public LayerImpl { |
| void SetProviderClientImpl( |
| scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl); |
| + inline media::VideoRotation video_rotation() const { return video_rotation_; } |
|
danakj
2014/08/05 20:18:21
nit: no inline
|
| + |
| private: |
| - VideoLayerImpl(LayerTreeImpl* tree_impl, int id); |
| + VideoLayerImpl(LayerTreeImpl* tree_impl, |
| + int id, |
| + media::VideoRotation video_rotation); |
| virtual const char* LayerTypeAsString() const OVERRIDE; |
| @@ -54,6 +60,8 @@ class CC_EXPORT VideoLayerImpl : public LayerImpl { |
| scoped_refptr<media::VideoFrame> frame_; |
| + media::VideoRotation video_rotation_; |
| + |
| scoped_ptr<VideoResourceUpdater> updater_; |
| VideoFrameExternalResources::ResourceType frame_resource_type_; |
| std::vector<ResourceProvider::ResourceId> frame_resources_; |