Commit 568545c2 authored by wkorman's avatar wkorman Committed by Commit bot

Fix property tree test indentation typo.

CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel

Review-Url: https://codereview.chromium.org/2608163007
Cr-Commit-Position: refs/heads/master@{#441472}
parent 6d16eeca
......@@ -38,9 +38,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
bool success = tree.CombineInversesBetween(0, 1, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
}
}
TEST(PropertyTreeTest, SetNeedsUpdate) {
TEST(PropertyTreeTest, SetNeedsUpdate) {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
TransformNode contents_root;
......@@ -54,9 +54,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
tree.set_needs_update(false);
tree.SetRootTransformsAndScales(0.6f, 1.f, gfx::Transform(), gfx::PointF());
EXPECT_FALSE(tree.needs_update());
}
}
TEST(PropertyTreeTest, ComputeTransformChild) {
TEST(PropertyTreeTest, ComputeTransformChild) {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
TransformNode contents_root;
......@@ -100,9 +100,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
success = tree.CombineInversesBetween(0, 2, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
}
}
TEST(PropertyTreeTest, ComputeTransformSibling) {
TEST(PropertyTreeTest, ComputeTransformSibling) {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
TransformNode contents_root;
......@@ -140,9 +140,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
bool success = tree.CombineInversesBetween(2, 3, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
}
}
TEST(PropertyTreeTest, ComputeTransformSiblingSingularAncestor) {
TEST(PropertyTreeTest, ComputeTransformSiblingSingularAncestor) {
// In this test, we have the following tree:
// root
// + singular
......@@ -196,9 +196,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
bool success = tree.CombineInversesBetween(3, 4, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
}
}
TEST(PropertyTreeTest, TransformsWithFlattening) {
TEST(PropertyTreeTest, TransformsWithFlattening) {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
EffectTree& effect_tree = property_trees.effect_tree;
......@@ -252,12 +252,12 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
property_trees.GetToTarget(child, effect_parent, &to_target);
EXPECT_TRANSFORMATION_MATRIX_EQ(rotation_about_x, to_target);
EXPECT_TRANSFORMATION_MATRIX_EQ(
flattened_rotation_about_x * rotation_about_x, tree.ToScreen(child));
EXPECT_TRANSFORMATION_MATRIX_EQ(flattened_rotation_about_x * rotation_about_x,
tree.ToScreen(child));
property_trees.GetToTarget(grand_child, effect_parent, &to_target);
EXPECT_TRANSFORMATION_MATRIX_EQ(
flattened_rotation_about_x * rotation_about_x, to_target);
EXPECT_TRANSFORMATION_MATRIX_EQ(flattened_rotation_about_x * rotation_about_x,
to_target);
EXPECT_TRANSFORMATION_MATRIX_EQ(flattened_rotation_about_x *
flattened_rotation_about_x *
......@@ -284,9 +284,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
grand_child_to_child.MakeIdentity();
tree.CombineTransformsBetween(grand_child, child, &grand_child_to_child);
EXPECT_TRANSFORMATION_MATRIX_EQ(rotation_about_x, grand_child_to_child);
}
}
TEST(PropertyTreeTest, MultiplicationOrder) {
TEST(PropertyTreeTest, MultiplicationOrder) {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
TransformNode contents_root;
......@@ -320,9 +320,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
transform = transform * inverse;
expected.MakeIdentity();
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
}
}
TEST(PropertyTreeTest, ComputeTransformWithUninvertibleTransform) {
TEST(PropertyTreeTest, ComputeTransformWithUninvertibleTransform) {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
TransformNode contents_root;
......@@ -352,9 +352,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
// succeed.
bool success = tree.CombineInversesBetween(1, 2, &inverse);
EXPECT_FALSE(success);
}
}
TEST(PropertyTreeTest, ComputeTransformToTargetWithZeroSurfaceContentsScale) {
TEST(PropertyTreeTest, ComputeTransformToTargetWithZeroSurfaceContentsScale) {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
TransformNode contents_root;
......@@ -415,9 +415,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
transform.MakeIdentity();
tree.CombineTransformsBetween(child_id, grand_parent_id, &transform);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform, transform);
}
}
TEST(PropertyTreeTest, FlatteningWhenDestinationHasOnlyFlatAncestors) {
TEST(PropertyTreeTest, FlatteningWhenDestinationHasOnlyFlatAncestors) {
// This tests that flattening is performed correctly when
// destination and its ancestors are flat, but there are 3d transforms
// and flattening between the source and destination.
......@@ -455,9 +455,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
tree.CombineTransformsBetween(grand_child, parent, &grand_child_to_parent);
EXPECT_TRANSFORMATION_MATRIX_EQ(flattened_rotation_about_x,
grand_child_to_parent);
}
}
TEST(PropertyTreeTest, ScreenSpaceOpacityUpdateTest) {
TEST(PropertyTreeTest, ScreenSpaceOpacityUpdateTest) {
// This tests that screen space opacity is updated for the subtree when
// opacity of a node changes.
PropertyTrees property_trees;
......@@ -476,9 +476,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
tree.set_needs_update(true);
draw_property_utils::ComputeEffects(&tree);
EXPECT_EQ(tree.Node(child)->screen_space_opacity, 0.25f);
}
}
TEST(PropertyTreeTest, NonIntegerTranslationTest) {
TEST(PropertyTreeTest, NonIntegerTranslationTest) {
// This tests that when a node has non-integer translation, the information
// is propagated to the subtree.
PropertyTrees property_trees;
......@@ -520,9 +520,9 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
tree.Node(parent)->node_and_ancestors_have_only_integer_translation);
EXPECT_TRUE(
tree.Node(child)->node_and_ancestors_have_only_integer_translation);
}
}
TEST(PropertyTreeTest, SingularTransformSnapTest) {
TEST(PropertyTreeTest, SingularTransformSnapTest) {
// This tests that to_target transform is not snapped when it has a singular
// transform.
PropertyTrees property_trees;
......@@ -568,7 +568,7 @@ TEST(PropertyTreeTest, ComputeTransformRoot) {
rounded.RoundTranslationComponents();
property_trees.GetToTarget(child, effect_parent, &to_target);
EXPECT_NE(to_target, rounded);
}
}
} // namespace
} // namespace cc
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment