| Index: cc/layers/video_layer.h
|
| diff --git a/cc/layers/video_layer.h b/cc/layers/video_layer.h
|
| index dd2c4e149ffadf8dc000ea585b0590f560635d92..5af656a441d2d883f2b3da3df7f579dc0cc32a75 100644
|
| --- a/cc/layers/video_layer.h
|
| +++ b/cc/layers/video_layer.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/callback.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/layers/layer.h"
|
| +#include "media/base/video_rotation.h"
|
|
|
| namespace media { class VideoFrame; }
|
|
|
| @@ -20,6 +21,8 @@ class VideoLayerImpl;
|
| class CC_EXPORT VideoLayer : public Layer {
|
| public:
|
| static scoped_refptr<VideoLayer> Create(VideoFrameProvider* provider);
|
| + static scoped_refptr<VideoLayer> Create(VideoFrameProvider* provider,
|
| + media::VideoRotation video_rotation);
|
|
|
| virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
|
| OVERRIDE;
|
| @@ -27,14 +30,19 @@ class CC_EXPORT VideoLayer : public Layer {
|
| virtual bool Update(ResourceUpdateQueue* queue,
|
| const OcclusionTracker<Layer>* occlusion) OVERRIDE;
|
|
|
| + virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
|
| +
|
| private:
|
| - explicit VideoLayer(VideoFrameProvider* provider);
|
| + explicit VideoLayer(VideoFrameProvider* provider,
|
| + media::VideoRotation video_rotation);
|
| virtual ~VideoLayer();
|
|
|
| // This pointer is only for passing to VideoLayerImpl's constructor. It should
|
| // never be dereferenced by this class.
|
| VideoFrameProvider* provider_;
|
|
|
| + media::VideoRotation video_rotation_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(VideoLayer);
|
| };
|
|
|
|
|