Chromium Code Reviews| Index: cc/layers/video_layer.cc |
| diff --git a/cc/layers/video_layer.cc b/cc/layers/video_layer.cc |
| index 4ddfdae69a64f9f4514b7d18be20d1083ba7a1fe..64b15fd64d4d1041a59de7ebca62266c54376996 100644 |
| --- a/cc/layers/video_layer.cc |
| +++ b/cc/layers/video_layer.cc |
| @@ -9,17 +9,27 @@ |
| namespace cc { |
| scoped_refptr<VideoLayer> VideoLayer::Create(VideoFrameProvider* provider) { |
|
danakj
2014/07/17 20:19:05
Do we need to keep 2 Create methods?
|
| - return make_scoped_refptr(new VideoLayer(provider)); |
| + return make_scoped_refptr(new VideoLayer(provider, media::VIDEO_ROTATION_0)); |
| } |
| -VideoLayer::VideoLayer(VideoFrameProvider* provider) : provider_(provider) { |
| +scoped_refptr<VideoLayer> VideoLayer::Create( |
| + VideoFrameProvider* provider, |
| + media::VideoRotation video_rotation) { |
| + return make_scoped_refptr(new VideoLayer(provider, video_rotation)); |
| +} |
| + |
| +VideoLayer::VideoLayer(VideoFrameProvider* provider, |
| + media::VideoRotation video_rotation) |
| + : provider_(provider), video_rotation_(video_rotation) { |
| DCHECK(provider_); |
| } |
| VideoLayer::~VideoLayer() {} |
| scoped_ptr<LayerImpl> VideoLayer::CreateLayerImpl(LayerTreeImpl* tree_impl) { |
| - return VideoLayerImpl::Create(tree_impl, id(), provider_).PassAs<LayerImpl>(); |
| + scoped_ptr<VideoLayerImpl> impl = |
| + VideoLayerImpl::Create(tree_impl, id(), provider_); |
|
danakj
2014/07/17 20:19:05
Sorry to backtrack, we don't normally have propert
|
| + return impl.PassAs<LayerImpl>(); |
| } |
| bool VideoLayer::Update(ResourceUpdateQueue* queue, |
| @@ -36,4 +46,11 @@ bool VideoLayer::Update(ResourceUpdateQueue* queue, |
| return updated; |
| } |
| +void VideoLayer::PushPropertiesTo(LayerImpl* layer) { |
| + Layer::PushPropertiesTo(layer); |
| + |
| + VideoLayerImpl* other = static_cast<VideoLayerImpl*>(layer); |
| + other->set_video_rotation(video_rotation_); |
| +} |
| + |
| } // namespace cc |