From 0940d410fd6f1da81a07a963a8b485cee310918f Mon Sep 17 00:00:00 2001 From: loyso Date: Sun, 13 Mar 2016 18:30:31 -0700 Subject: 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} --- cc/layers/video_layer.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'cc/layers/video_layer.h') 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 Create(const LayerSettings& settings, - VideoFrameProvider* provider, + static scoped_refptr Create(VideoFrameProvider* provider, media::VideoRotation video_rotation); scoped_ptr 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 -- cgit v1.1