diff options
| author | loyso <loyso@chromium.org> | 2016-03-13 18:30:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-14 01:32:31 +0000 |
| commit | 0940d410fd6f1da81a07a963a8b485cee310918f (patch) | |
| tree | 4d8d164bd8319181d8d3374c66e1338a5a9d963c /cc/layers/video_layer.h | |
| parent | 90f8fccd97c06ddfd0c0e9b7350a4f7fffccfb36 (diff) | |
| download | chromium_src-0940d410fd6f1da81a07a963a8b485cee310918f.zip chromium_src-0940d410fd6f1da81a07a963a8b485cee310918f.tar.gz chromium_src-0940d410fd6f1da81a07a963a8b485cee310918f.tar.bz2 | |
CC Animation: Erase cc::LayerSettings everywhere.
Also, erase LayerTreeSettings::use_compositor_animation_timelines flag.
BUG=575041
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1783613004
Cr-Commit-Position: refs/heads/master@{#380914}
Diffstat (limited to 'cc/layers/video_layer.h')
| -rw-r--r-- | cc/layers/video_layer.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cc/layers/video_layer.h b/cc/layers/video_layer.h index fdc9753..4828468 100644 --- a/cc/layers/video_layer.h +++ b/cc/layers/video_layer.h @@ -9,7 +9,6 @@ #include "base/macros.h" #include "cc/base/cc_export.h" #include "cc/layers/layer.h" -#include "cc/layers/layer_settings.h" #include "media/base/video_rotation.h" namespace media { class VideoFrame; } @@ -22,8 +21,7 @@ class VideoLayerImpl; // A Layer that contains a Video element. class CC_EXPORT VideoLayer : public Layer { public: - static scoped_refptr<VideoLayer> Create(const LayerSettings& settings, - VideoFrameProvider* provider, + static scoped_refptr<VideoLayer> Create(VideoFrameProvider* provider, media::VideoRotation video_rotation); scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; @@ -31,9 +29,7 @@ class CC_EXPORT VideoLayer : public Layer { bool Update() override; private: - VideoLayer(const LayerSettings& settings, - VideoFrameProvider* provider, - media::VideoRotation video_rotation); + VideoLayer(VideoFrameProvider* provider, media::VideoRotation video_rotation); ~VideoLayer() override; // This pointer is only for passing to VideoLayerImpl's constructor. It should |