OLD | NEW |
1 //// Copyright 2011 The Chromium Authors. All rights reserved. | 1 //// Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/trees/layer_tree_host_common.h" | 5 #include "cc/trees/layer_tree_host_common.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "cc/animation/keyframed_animation_curve.h" | 10 #include "cc/animation/keyframed_animation_curve.h" |
(...skipping 3673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3684 | 3684 |
3685 // Verify parent transforms | 3685 // Verify parent transforms |
3686 gfx::Transform expected_parent_transform; | 3686 gfx::Transform expected_parent_transform; |
3687 expected_parent_transform.Scale(device_scale_factor, device_scale_factor); | 3687 expected_parent_transform.Scale(device_scale_factor, device_scale_factor); |
3688 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_parent_transform, | 3688 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_parent_transform, |
3689 parent->screen_space_transform()); | 3689 parent->screen_space_transform()); |
3690 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_parent_transform, | 3690 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_parent_transform, |
3691 parent->draw_transform()); | 3691 parent->draw_transform()); |
3692 | 3692 |
3693 // Verify results of transformed parent rects | 3693 // Verify results of transformed parent rects |
3694 gfx::RectF parent_bounds(parent->bounds()); | 3694 gfx::RectF parent_bounds(gfx::SizeF(parent->bounds())); |
3695 | 3695 |
3696 gfx::RectF parent_draw_rect = | 3696 gfx::RectF parent_draw_rect = |
3697 MathUtil::MapClippedRect(parent->draw_transform(), parent_bounds); | 3697 MathUtil::MapClippedRect(parent->draw_transform(), parent_bounds); |
3698 gfx::RectF parent_screen_space_rect = | 3698 gfx::RectF parent_screen_space_rect = |
3699 MathUtil::MapClippedRect(parent->screen_space_transform(), parent_bounds); | 3699 MathUtil::MapClippedRect(parent->screen_space_transform(), parent_bounds); |
3700 | 3700 |
3701 gfx::RectF expected_parent_draw_rect(parent->bounds()); | 3701 gfx::RectF expected_parent_draw_rect(gfx::SizeF(parent->bounds())); |
3702 expected_parent_draw_rect.Scale(device_scale_factor); | 3702 expected_parent_draw_rect.Scale(device_scale_factor); |
3703 EXPECT_FLOAT_RECT_EQ(expected_parent_draw_rect, parent_draw_rect); | 3703 EXPECT_FLOAT_RECT_EQ(expected_parent_draw_rect, parent_draw_rect); |
3704 EXPECT_FLOAT_RECT_EQ(expected_parent_draw_rect, parent_screen_space_rect); | 3704 EXPECT_FLOAT_RECT_EQ(expected_parent_draw_rect, parent_screen_space_rect); |
3705 | 3705 |
3706 // Verify child and child_empty transforms. They should match. | 3706 // Verify child and child_empty transforms. They should match. |
3707 gfx::Transform expected_child_transform; | 3707 gfx::Transform expected_child_transform; |
3708 expected_child_transform.Scale(device_scale_factor, device_scale_factor); | 3708 expected_child_transform.Scale(device_scale_factor, device_scale_factor); |
3709 expected_child_transform.Translate(child->position().x(), | 3709 expected_child_transform.Translate(child->position().x(), |
3710 child->position().y()); | 3710 child->position().y()); |
3711 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, | 3711 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, |
3712 child->draw_transform()); | 3712 child->draw_transform()); |
3713 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, | 3713 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, |
3714 child->screen_space_transform()); | 3714 child->screen_space_transform()); |
3715 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, | 3715 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, |
3716 child_empty->draw_transform()); | 3716 child_empty->draw_transform()); |
3717 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, | 3717 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, |
3718 child_empty->screen_space_transform()); | 3718 child_empty->screen_space_transform()); |
3719 | 3719 |
3720 // Verify results of transformed child and child_empty rects. They should | 3720 // Verify results of transformed child and child_empty rects. They should |
3721 // match. | 3721 // match. |
3722 gfx::RectF child_bounds(child->bounds()); | 3722 gfx::RectF child_bounds(gfx::SizeF(child->bounds())); |
3723 | 3723 |
3724 gfx::RectF child_draw_rect = | 3724 gfx::RectF child_draw_rect = |
3725 MathUtil::MapClippedRect(child->draw_transform(), child_bounds); | 3725 MathUtil::MapClippedRect(child->draw_transform(), child_bounds); |
3726 gfx::RectF child_screen_space_rect = | 3726 gfx::RectF child_screen_space_rect = |
3727 MathUtil::MapClippedRect(child->screen_space_transform(), child_bounds); | 3727 MathUtil::MapClippedRect(child->screen_space_transform(), child_bounds); |
3728 | 3728 |
3729 gfx::RectF child_empty_draw_rect = | 3729 gfx::RectF child_empty_draw_rect = |
3730 MathUtil::MapClippedRect(child_empty->draw_transform(), child_bounds); | 3730 MathUtil::MapClippedRect(child_empty->draw_transform(), child_bounds); |
3731 gfx::RectF child_empty_screen_space_rect = MathUtil::MapClippedRect( | 3731 gfx::RectF child_empty_screen_space_rect = MathUtil::MapClippedRect( |
3732 child_empty->screen_space_transform(), child_bounds); | 3732 child_empty->screen_space_transform(), child_bounds); |
3733 | 3733 |
3734 gfx::RectF expected_child_draw_rect(child->position(), child->bounds()); | 3734 gfx::RectF expected_child_draw_rect(child->position(), |
| 3735 gfx::SizeF(child->bounds())); |
3735 expected_child_draw_rect.Scale(device_scale_factor); | 3736 expected_child_draw_rect.Scale(device_scale_factor); |
3736 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_draw_rect); | 3737 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_draw_rect); |
3737 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_screen_space_rect); | 3738 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_screen_space_rect); |
3738 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_empty_draw_rect); | 3739 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_empty_draw_rect); |
3739 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_empty_screen_space_rect); | 3740 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_empty_screen_space_rect); |
3740 } | 3741 } |
3741 | 3742 |
3742 TEST_F(LayerTreeHostCommonScalingTest, SurfaceLayerTransformsInHighDPI) { | 3743 TEST_F(LayerTreeHostCommonScalingTest, SurfaceLayerTransformsInHighDPI) { |
3743 // Verify draw and screen space transforms of layers in a surface. | 3744 // Verify draw and screen space transforms of layers in a surface. |
3744 gfx::Transform identity_matrix; | 3745 gfx::Transform identity_matrix; |
(...skipping 4188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7933 gfx::PointF(), gfx::Size(30, 30), true, false, | 7934 gfx::PointF(), gfx::Size(30, 30), true, false, |
7934 false); | 7935 false); |
7935 | 7936 |
7936 ExecuteCalculateDrawProperties(root); | 7937 ExecuteCalculateDrawProperties(root); |
7937 | 7938 |
7938 EXPECT_EQ(gfx::Rect(30, 30), test_layer->clip_rect()); | 7939 EXPECT_EQ(gfx::Rect(30, 30), test_layer->clip_rect()); |
7939 } | 7940 } |
7940 | 7941 |
7941 } // namespace | 7942 } // namespace |
7942 } // namespace cc | 7943 } // namespace cc |
OLD | NEW |