Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Unified Diff: cc/layers/video_layer.h

Issue 388643002: Rotation into Video Layer + Content Transform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reverted to Patch 11 Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/layers/video_layer.cc » ('j') | cc/layers/video_layer_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/video_layer.h
diff --git a/cc/layers/video_layer.h b/cc/layers/video_layer.h
index dd2c4e149ffadf8dc000ea585b0590f560635d92..c2a9386e5943810f4c79d4f0ac880617b3113eaa 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; }
@@ -19,7 +20,8 @@ class VideoLayerImpl;
// A Layer that contains a Video element.
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 +29,19 @@ class CC_EXPORT VideoLayer : public Layer {
virtual bool Update(ResourceUpdateQueue* queue,
const OcclusionTracker<Layer>* occlusion) OVERRIDE;
+ inline media::VideoRotation video_rotation() const { return video_rotation_; }
danakj 2014/08/05 20:18:21 nit: don't need |inline| but i don't see any call
+
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);
};
« no previous file with comments | « no previous file | cc/layers/video_layer.cc » ('j') | cc/layers/video_layer_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698