Index: cc/trees/layer_tree_host_unittest_occlusion.cc |
diff --git a/cc/trees/layer_tree_host_unittest_occlusion.cc b/cc/trees/layer_tree_host_unittest_occlusion.cc |
index 9974ae4066b440c171f747d1df22d005a3cb67be..37c56d1e74a2a33bf1ae940af27a49e9b9e1d156 100644 |
--- a/cc/trees/layer_tree_host_unittest_occlusion.cc |
+++ b/cc/trees/layer_tree_host_unittest_occlusion.cc |
@@ -30,11 +30,11 @@ class LayerTreeHostOcclusionTestDrawPropertiesOnLayer |
: public LayerTreeHostOcclusionTest { |
public: |
void SetupTree() override { |
- scoped_refptr<Layer> root = Layer::Create(); |
+ scoped_refptr<Layer> root = Layer::Create(layer_settings()); |
root->SetBounds(gfx::Size(100, 100)); |
root->SetIsDrawable(true); |
- scoped_refptr<Layer> child = Layer::Create(); |
+ scoped_refptr<Layer> child = Layer::Create(layer_settings()); |
child->SetBounds(gfx::Size(50, 60)); |
child->SetPosition(gfx::PointF(10.f, 5.5f)); |
child->SetContentsOpaque(true); |
@@ -76,18 +76,18 @@ class LayerTreeHostOcclusionTestDrawPropertiesOnSurface |
: public LayerTreeHostOcclusionTest { |
public: |
void SetupTree() override { |
- scoped_refptr<Layer> root = Layer::Create(); |
+ scoped_refptr<Layer> root = Layer::Create(layer_settings()); |
root->SetBounds(gfx::Size(100, 100)); |
root->SetIsDrawable(true); |
- scoped_refptr<Layer> child = Layer::Create(); |
+ scoped_refptr<Layer> child = Layer::Create(layer_settings()); |
child->SetBounds(gfx::Size(1, 1)); |
child->SetPosition(gfx::PointF(10.f, 5.5f)); |
child->SetIsDrawable(true); |
child->SetForceRenderSurface(true); |
root->AddChild(child); |
- scoped_refptr<Layer> child2 = Layer::Create(); |
+ scoped_refptr<Layer> child2 = Layer::Create(layer_settings()); |
child2->SetBounds(gfx::Size(10, 12)); |
child2->SetPosition(gfx::PointF(13.f, 8.5f)); |
child2->SetContentsOpaque(true); |
@@ -128,28 +128,29 @@ class LayerTreeHostOcclusionTestDrawPropertiesOnMask |
: public LayerTreeHostOcclusionTest { |
public: |
void SetupTree() override { |
- scoped_refptr<Layer> root = Layer::Create(); |
+ scoped_refptr<Layer> root = Layer::Create(layer_settings()); |
root->SetBounds(gfx::Size(100, 100)); |
root->SetIsDrawable(true); |
- scoped_refptr<Layer> child = Layer::Create(); |
+ scoped_refptr<Layer> child = Layer::Create(layer_settings()); |
child->SetBounds(gfx::Size(30, 40)); |
child->SetPosition(gfx::PointF(10.f, 5.5f)); |
child->SetIsDrawable(true); |
root->AddChild(child); |
- scoped_refptr<Layer> make_surface_bigger = Layer::Create(); |
+ scoped_refptr<Layer> make_surface_bigger = Layer::Create(layer_settings()); |
make_surface_bigger->SetBounds(gfx::Size(100, 100)); |
make_surface_bigger->SetPosition(gfx::PointF(-10.f, -15.f)); |
make_surface_bigger->SetIsDrawable(true); |
child->AddChild(make_surface_bigger); |
- scoped_refptr<Layer> mask = PictureLayer::Create(&client_); |
+ scoped_refptr<Layer> mask = |
+ PictureLayer::Create(layer_settings(), &client_); |
mask->SetBounds(gfx::Size(30, 40)); |
mask->SetIsDrawable(true); |
child->SetMaskLayer(mask.get()); |
- scoped_refptr<Layer> child2 = Layer::Create(); |
+ scoped_refptr<Layer> child2 = Layer::Create(layer_settings()); |
child2->SetBounds(gfx::Size(10, 12)); |
child2->SetPosition(gfx::PointF(13.f, 8.5f)); |
child2->SetContentsOpaque(true); |
@@ -198,29 +199,30 @@ class LayerTreeHostOcclusionTestDrawPropertiesInsideReplica |
: public LayerTreeHostOcclusionTest { |
public: |
void SetupTree() override { |
- scoped_refptr<Layer> root = Layer::Create(); |
+ scoped_refptr<Layer> root = Layer::Create(layer_settings()); |
root->SetBounds(gfx::Size(100, 100)); |
root->SetIsDrawable(true); |
- scoped_refptr<Layer> child = Layer::Create(); |
+ scoped_refptr<Layer> child = Layer::Create(layer_settings()); |
child->SetBounds(gfx::Size(1, 1)); |
child->SetPosition(gfx::PointF(10.f, 5.5f)); |
child->SetIsDrawable(true); |
child->SetForceRenderSurface(true); |
root->AddChild(child); |
- scoped_refptr<Layer> replica = Layer::Create(); |
+ scoped_refptr<Layer> replica = Layer::Create(layer_settings()); |
gfx::Transform translate; |
translate.Translate(20.f, 4.f); |
replica->SetTransform(translate); |
child->SetReplicaLayer(replica.get()); |
- scoped_refptr<Layer> mask = PictureLayer::Create(&client_); |
+ scoped_refptr<Layer> mask = |
+ PictureLayer::Create(layer_settings(), &client_); |
mask->SetBounds(gfx::Size(30, 40)); |
mask->SetIsDrawable(true); |
child->SetMaskLayer(mask.get()); |
- scoped_refptr<Layer> child2 = Layer::Create(); |
+ scoped_refptr<Layer> child2 = Layer::Create(layer_settings()); |
child2->SetBounds(gfx::Size(10, 12)); |
child2->SetPosition(gfx::PointF(13.f, 8.5f)); |
child2->SetContentsOpaque(true); |