summaryrefslogtreecommitdiffstats
path: root/cc/layers/surface_layer_unittest.cc
diff options
context:
space:
mode:
authorloyso <loyso@chromium.org>2016-03-13 18:30:31 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-14 01:32:31 +0000
commit0940d410fd6f1da81a07a963a8b485cee310918f (patch)
tree4d8d164bd8319181d8d3374c66e1338a5a9d963c /cc/layers/surface_layer_unittest.cc
parent90f8fccd97c06ddfd0c0e9b7350a4f7fffccfb36 (diff)
downloadchromium_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/surface_layer_unittest.cc')
-rw-r--r--cc/layers/surface_layer_unittest.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/cc/layers/surface_layer_unittest.cc b/cc/layers/surface_layer_unittest.cc
index 2f8d5cd..0c15b5c 100644
--- a/cc/layers/surface_layer_unittest.cc
+++ b/cc/layers/surface_layer_unittest.cc
@@ -49,7 +49,6 @@ class SurfaceLayerTest : public testing::Test {
FakeLayerTreeHostClient fake_client_;
TestTaskGraphRunner task_graph_runner_;
scoped_ptr<FakeLayerTreeHost> layer_tree_host_;
- LayerSettings layer_settings_;
};
void SatisfyCallback(SurfaceSequence* out, SurfaceSequence in) {
@@ -72,7 +71,7 @@ TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
SurfaceId required_id;
std::set<SurfaceSequence> required_seq;
scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create(
- layer_settings_, base::Bind(&SatisfyCallback, &blank_change),
+ base::Bind(&SatisfyCallback, &blank_change),
base::Bind(&RequireCallback, &required_id, &required_seq)));
layer->SetSurfaceId(SurfaceId(1), 1.f, gfx::Size(1, 1));
layer_tree_host_->set_surface_id_namespace(1);
@@ -81,7 +80,7 @@ TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
scoped_ptr<FakeLayerTreeHost> layer_tree_host2 =
FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_);
scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create(
- layer_settings_, base::Bind(&SatisfyCallback, &blank_change),
+ base::Bind(&SatisfyCallback, &blank_change),
base::Bind(&RequireCallback, &required_id, &required_seq)));
layer2->SetSurfaceId(SurfaceId(1), 1.f, gfx::Size(1, 1));
layer_tree_host2->set_surface_id_namespace(2);
@@ -128,7 +127,7 @@ class SurfaceLayerSwapPromise : public LayerTreeTest {
void BeginTest() override {
layer_tree_host()->set_surface_id_namespace(1);
layer_ = SurfaceLayer::Create(
- layer_settings(), base::Bind(&SatisfyCallback, &satisfied_sequence_),
+ base::Bind(&SatisfyCallback, &satisfied_sequence_),
base::Bind(&RequireCallback, &required_id_, &required_set_));
layer_->SetSurfaceId(SurfaceId(1), 1.f, gfx::Size(1, 1));
@@ -146,7 +145,7 @@ class SurfaceLayerSwapPromise : public LayerTreeTest {
gfx::Size bounds(100, 100);
layer_tree_host()->SetViewportSize(bounds);
- blank_layer_ = SolidColorLayer::Create(layer_settings());
+ blank_layer_ = SolidColorLayer::Create();
blank_layer_->SetIsDrawable(true);
blank_layer_->SetBounds(gfx::Size(10, 10));