Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_LAYERS_VIDEO_LAYER_H_ | 5 #ifndef CC_LAYERS_VIDEO_LAYER_H_ |
| 6 #define CC_LAYERS_VIDEO_LAYER_H_ | 6 #define CC_LAYERS_VIDEO_LAYER_H_ |
| 7 | 7 |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "cc/base/cc_export.h" | 9 #include "cc/base/cc_export.h" |
| 10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
| 11 #include "media/base/video_rotation.h" | |
| 11 | 12 |
| 12 namespace media { class VideoFrame; } | 13 namespace media { class VideoFrame; } |
| 13 | 14 |
| 14 namespace cc { | 15 namespace cc { |
| 15 | 16 |
| 16 class VideoFrameProvider; | 17 class VideoFrameProvider; |
| 17 class VideoLayerImpl; | 18 class VideoLayerImpl; |
| 18 | 19 |
| 19 // A Layer that contains a Video element. | 20 // A Layer that contains a Video element. |
| 20 class CC_EXPORT VideoLayer : public Layer { | 21 class CC_EXPORT VideoLayer : public Layer { |
| 21 public: | 22 public: |
| 22 static scoped_refptr<VideoLayer> Create(VideoFrameProvider* provider); | 23 static scoped_refptr<VideoLayer> Create(VideoFrameProvider* provider); |
| 23 | 24 |
| 24 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) | 25 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) |
| 25 OVERRIDE; | 26 OVERRIDE; |
| 26 | 27 |
| 27 virtual bool Update(ResourceUpdateQueue* queue, | 28 virtual bool Update(ResourceUpdateQueue* queue, |
| 28 const OcclusionTracker<Layer>* occlusion) OVERRIDE; | 29 const OcclusionTracker<Layer>* occlusion) OVERRIDE; |
| 29 | 30 |
| 31 virtual void set_video_rotation(media::VideoRotation video_rotation); | |
|
scherkus (not reviewing)
2014/07/11 18:54:07
drop virtual and inline the setter as per style:
| |
| 32 | |
| 30 private: | 33 private: |
| 31 explicit VideoLayer(VideoFrameProvider* provider); | 34 explicit VideoLayer(VideoFrameProvider* provider); |
| 32 virtual ~VideoLayer(); | 35 virtual ~VideoLayer(); |
| 33 | 36 |
| 34 // This pointer is only for passing to VideoLayerImpl's constructor. It should | 37 // This pointer is only for passing to VideoLayerImpl's constructor. It should |
| 35 // never be dereferenced by this class. | 38 // never be dereferenced by this class. |
| 36 VideoFrameProvider* provider_; | 39 VideoFrameProvider* provider_; |
| 37 | 40 |
| 41 media::VideoRotation video_rotation_; | |
| 42 | |
| 38 DISALLOW_COPY_AND_ASSIGN(VideoLayer); | 43 DISALLOW_COPY_AND_ASSIGN(VideoLayer); |
| 39 }; | 44 }; |
| 40 | 45 |
| 41 } // namespace cc | 46 } // namespace cc |
| 42 | 47 |
| 43 #endif // CC_LAYERS_VIDEO_LAYER_H_ | 48 #endif // CC_LAYERS_VIDEO_LAYER_H_ |
| OLD | NEW |