Index: cc/layers/layer_position_constraint_unittest.cc |
diff --git a/cc/layers/layer_position_constraint_unittest.cc b/cc/layers/layer_position_constraint_unittest.cc |
index 269bc9656c57af57147eeaad03061078b3bc2bc8..d9e1f64bbc8fd6ce3fa60dadd71964901d581579 100644 |
--- a/cc/layers/layer_position_constraint_unittest.cc |
+++ b/cc/layers/layer_position_constraint_unittest.cc |
@@ -22,14 +22,12 @@ void SetLayerPropertiesForTesting(LayerImpl* layer, |
const gfx::Point3F& transform_origin, |
const gfx::PointF& position, |
const gfx::Size& bounds, |
- bool flatten_transform, |
- bool is_3d_sorted) { |
+ bool flatten_transform) { |
layer->SetTransform(transform); |
layer->SetTransformOrigin(transform_origin); |
layer->SetPosition(position); |
layer->SetBounds(bounds); |
layer->SetShouldFlattenTransform(flatten_transform); |
- layer->SetIs3dSorted(is_3d_sorted); |
layer->SetContentBounds(bounds); |
} |
@@ -96,29 +94,21 @@ class LayerPositionConstraintTest : public testing::Test { |
transform_origin, |
position, |
bounds, |
- true, |
- false); |
- SetLayerPropertiesForTesting(child.get(), |
- IdentityMatrix, |
- transform_origin, |
- position, |
- bounds, |
- true, |
- false); |
+ true); |
+ SetLayerPropertiesForTesting( |
+ child.get(), IdentityMatrix, transform_origin, position, bounds, true); |
SetLayerPropertiesForTesting(grand_child.get(), |
IdentityMatrix, |
transform_origin, |
position, |
bounds, |
- true, |
- false); |
+ true); |
SetLayerPropertiesForTesting(great_grand_child.get(), |
IdentityMatrix, |
transform_origin, |
position, |
bounds, |
- true, |
- false); |
+ true); |
root->SetBounds(clip_bounds); |
scroll_layer->SetScrollClipLayer(root->id()); |
@@ -744,8 +734,7 @@ TEST_F(LayerPositionConstraintTest, |
gfx::Point3F(), |
gfx::PointF(), |
gfx::Size(100, 100), |
- true, |
- false); |
+ true); |
great_grand_child->AddChild(fixed_position_child.Pass()); |
} |
LayerImpl* fixed_position_child = great_grand_child->children()[0]; |