| Index: cc/trees/layer_tree_host_unittest_damage.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc
|
| index a1c4cdf69ad69334c1114c50baa052faf49975d6..fdb3e17870995fb41351f019840cd5d9cf2d58fc 100644
|
| --- a/cc/trees/layer_tree_host_unittest_damage.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_damage.cc
|
| @@ -27,8 +27,7 @@ class LayerTreeHostDamageTestSetNeedsRedraw
|
| : public LayerTreeHostDamageTest {
|
| void SetupTree() override {
|
| // Viewport is 10x10.
|
| - scoped_refptr<FakePictureLayer> root =
|
| - FakePictureLayer::Create(layer_settings(), &client_);
|
| + scoped_refptr<FakePictureLayer> root = FakePictureLayer::Create(&client_);
|
| root->SetBounds(gfx::Size(10, 10));
|
|
|
| layer_tree_host()->SetRootLayer(root);
|
| @@ -90,8 +89,7 @@ class LayerTreeHostDamageTestSetViewportSize
|
| : public LayerTreeHostDamageTest {
|
| void SetupTree() override {
|
| // Viewport is 10x10.
|
| - scoped_refptr<FakePictureLayer> root =
|
| - FakePictureLayer::Create(layer_settings(), &client_);
|
| + scoped_refptr<FakePictureLayer> root = FakePictureLayer::Create(&client_);
|
| root->SetBounds(gfx::Size(10, 10));
|
|
|
| layer_tree_host()->SetRootLayer(root);
|
| @@ -158,12 +156,11 @@ class LayerTreeHostDamageTestNoDamageDoesNotSwap
|
| }
|
|
|
| void SetupTree() override {
|
| - scoped_refptr<FakePictureLayer> root =
|
| - FakePictureLayer::Create(layer_settings(), &client_);
|
| + scoped_refptr<FakePictureLayer> root = FakePictureLayer::Create(&client_);
|
| root->SetBounds(gfx::Size(10, 10));
|
|
|
| // Most of the layer isn't visible.
|
| - content_ = FakePictureLayer::Create(layer_settings(), &client_);
|
| + content_ = FakePictureLayer::Create(&client_);
|
| content_->SetBounds(gfx::Size(2000, 100));
|
| root->AddChild(content_);
|
|
|
| @@ -244,8 +241,8 @@ class LayerTreeHostDamageTestForcedFullDamage : public LayerTreeHostDamageTest {
|
| void BeginTest() override { PostSetNeedsCommitToMainThread(); }
|
|
|
| void SetupTree() override {
|
| - root_ = FakePictureLayer::Create(layer_settings(), &client_);
|
| - child_ = FakePictureLayer::Create(layer_settings(), &client_);
|
| + root_ = FakePictureLayer::Create(&client_);
|
| + child_ = FakePictureLayer::Create(&client_);
|
|
|
| root_->SetBounds(gfx::Size(500, 500));
|
| child_->SetPosition(gfx::PointF(100.f, 100.f));
|
| @@ -335,14 +332,13 @@ SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDamageTestForcedFullDamage);
|
|
|
| class LayerTreeHostScrollbarDamageTest : public LayerTreeHostDamageTest {
|
| void SetupTree() override {
|
| - scoped_refptr<Layer> root_layer = Layer::Create(layer_settings());
|
| + scoped_refptr<Layer> root_layer = Layer::Create();
|
| root_layer->SetBounds(gfx::Size(400, 400));
|
| root_layer->SetMasksToBounds(true);
|
| layer_tree_host()->SetRootLayer(root_layer);
|
|
|
| - scoped_refptr<Layer> scroll_clip_layer = Layer::Create(layer_settings());
|
| - scoped_refptr<Layer> content_layer =
|
| - FakePictureLayer::Create(layer_settings(), &client_);
|
| + scoped_refptr<Layer> scroll_clip_layer = Layer::Create();
|
| + scoped_refptr<Layer> content_layer = FakePictureLayer::Create(&client_);
|
| content_layer->SetScrollClipLayerId(scroll_clip_layer->id());
|
| content_layer->SetScrollOffset(gfx::ScrollOffset(10, 20));
|
| content_layer->SetBounds(gfx::Size(100, 200));
|
| @@ -353,8 +349,8 @@ class LayerTreeHostScrollbarDamageTest : public LayerTreeHostDamageTest {
|
| scroll_clip_layer->AddChild(content_layer);
|
| root_layer->AddChild(scroll_clip_layer);
|
|
|
| - scoped_refptr<Layer> scrollbar_layer = FakePaintedScrollbarLayer::Create(
|
| - layer_settings(), false, true, content_layer->id());
|
| + scoped_refptr<Layer> scrollbar_layer =
|
| + FakePaintedScrollbarLayer::Create(false, true, content_layer->id());
|
| scrollbar_layer->SetPosition(gfx::PointF(300.f, 300.f));
|
| scrollbar_layer->SetBounds(gfx::Size(10, 100));
|
| scrollbar_layer->ToScrollbarLayer()->SetScrollLayer(content_layer->id());
|
|
|