| 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 3674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3685 | 3685 |
| 3686 // Verify parent transforms | 3686 // Verify parent transforms |
| 3687 gfx::Transform expected_parent_transform; | 3687 gfx::Transform expected_parent_transform; |
| 3688 expected_parent_transform.Scale(device_scale_factor, device_scale_factor); | 3688 expected_parent_transform.Scale(device_scale_factor, device_scale_factor); |
| 3689 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_parent_transform, | 3689 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_parent_transform, |
| 3690 parent->screen_space_transform()); | 3690 parent->screen_space_transform()); |
| 3691 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_parent_transform, | 3691 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_parent_transform, |
| 3692 parent->draw_transform()); | 3692 parent->draw_transform()); |
| 3693 | 3693 |
| 3694 // Verify results of transformed parent rects | 3694 // Verify results of transformed parent rects |
| 3695 gfx::RectF parent_bounds(parent->bounds()); | 3695 gfx::RectF parent_bounds(gfx::SizeF(parent->bounds())); |
| 3696 | 3696 |
| 3697 gfx::RectF parent_draw_rect = | 3697 gfx::RectF parent_draw_rect = |
| 3698 MathUtil::MapClippedRect(parent->draw_transform(), parent_bounds); | 3698 MathUtil::MapClippedRect(parent->draw_transform(), parent_bounds); |
| 3699 gfx::RectF parent_screen_space_rect = | 3699 gfx::RectF parent_screen_space_rect = |
| 3700 MathUtil::MapClippedRect(parent->screen_space_transform(), parent_bounds); | 3700 MathUtil::MapClippedRect(parent->screen_space_transform(), parent_bounds); |
| 3701 | 3701 |
| 3702 gfx::RectF expected_parent_draw_rect(parent->bounds()); | 3702 gfx::RectF expected_parent_draw_rect(gfx::SizeF(parent->bounds())); |
| 3703 expected_parent_draw_rect.Scale(device_scale_factor); | 3703 expected_parent_draw_rect.Scale(device_scale_factor); |
| 3704 EXPECT_FLOAT_RECT_EQ(expected_parent_draw_rect, parent_draw_rect); | 3704 EXPECT_FLOAT_RECT_EQ(expected_parent_draw_rect, parent_draw_rect); |
| 3705 EXPECT_FLOAT_RECT_EQ(expected_parent_draw_rect, parent_screen_space_rect); | 3705 EXPECT_FLOAT_RECT_EQ(expected_parent_draw_rect, parent_screen_space_rect); |
| 3706 | 3706 |
| 3707 // Verify child and child_empty transforms. They should match. | 3707 // Verify child and child_empty transforms. They should match. |
| 3708 gfx::Transform expected_child_transform; | 3708 gfx::Transform expected_child_transform; |
| 3709 expected_child_transform.Scale(device_scale_factor, device_scale_factor); | 3709 expected_child_transform.Scale(device_scale_factor, device_scale_factor); |
| 3710 expected_child_transform.Translate(child->position().x(), | 3710 expected_child_transform.Translate(child->position().x(), |
| 3711 child->position().y()); | 3711 child->position().y()); |
| 3712 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, | 3712 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, |
| 3713 child->draw_transform()); | 3713 child->draw_transform()); |
| 3714 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, | 3714 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, |
| 3715 child->screen_space_transform()); | 3715 child->screen_space_transform()); |
| 3716 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, | 3716 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, |
| 3717 child_empty->draw_transform()); | 3717 child_empty->draw_transform()); |
| 3718 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, | 3718 EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform, |
| 3719 child_empty->screen_space_transform()); | 3719 child_empty->screen_space_transform()); |
| 3720 | 3720 |
| 3721 // Verify results of transformed child and child_empty rects. They should | 3721 // Verify results of transformed child and child_empty rects. They should |
| 3722 // match. | 3722 // match. |
| 3723 gfx::RectF child_bounds(child->bounds()); | 3723 gfx::RectF child_bounds(gfx::SizeF(child->bounds())); |
| 3724 | 3724 |
| 3725 gfx::RectF child_draw_rect = | 3725 gfx::RectF child_draw_rect = |
| 3726 MathUtil::MapClippedRect(child->draw_transform(), child_bounds); | 3726 MathUtil::MapClippedRect(child->draw_transform(), child_bounds); |
| 3727 gfx::RectF child_screen_space_rect = | 3727 gfx::RectF child_screen_space_rect = |
| 3728 MathUtil::MapClippedRect(child->screen_space_transform(), child_bounds); | 3728 MathUtil::MapClippedRect(child->screen_space_transform(), child_bounds); |
| 3729 | 3729 |
| 3730 gfx::RectF child_empty_draw_rect = | 3730 gfx::RectF child_empty_draw_rect = |
| 3731 MathUtil::MapClippedRect(child_empty->draw_transform(), child_bounds); | 3731 MathUtil::MapClippedRect(child_empty->draw_transform(), child_bounds); |
| 3732 gfx::RectF child_empty_screen_space_rect = MathUtil::MapClippedRect( | 3732 gfx::RectF child_empty_screen_space_rect = MathUtil::MapClippedRect( |
| 3733 child_empty->screen_space_transform(), child_bounds); | 3733 child_empty->screen_space_transform(), child_bounds); |
| 3734 | 3734 |
| 3735 gfx::RectF expected_child_draw_rect(child->position(), child->bounds()); | 3735 gfx::RectF expected_child_draw_rect(child->position(), |
| 3736 gfx::SizeF(child->bounds())); |
| 3736 expected_child_draw_rect.Scale(device_scale_factor); | 3737 expected_child_draw_rect.Scale(device_scale_factor); |
| 3737 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_draw_rect); | 3738 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_draw_rect); |
| 3738 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_screen_space_rect); | 3739 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_screen_space_rect); |
| 3739 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_empty_draw_rect); | 3740 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_empty_draw_rect); |
| 3740 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_empty_screen_space_rect); | 3741 EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_empty_screen_space_rect); |
| 3741 } | 3742 } |
| 3742 | 3743 |
| 3743 TEST_F(LayerTreeHostCommonScalingTest, SurfaceLayerTransformsInHighDPI) { | 3744 TEST_F(LayerTreeHostCommonScalingTest, SurfaceLayerTransformsInHighDPI) { |
| 3744 // Verify draw and screen space transforms of layers in a surface. | 3745 // Verify draw and screen space transforms of layers in a surface. |
| 3745 gfx::Transform identity_matrix; | 3746 gfx::Transform identity_matrix; |
| (...skipping 4188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7934 gfx::PointF(), gfx::Size(30, 30), true, false, | 7935 gfx::PointF(), gfx::Size(30, 30), true, false, |
| 7935 false); | 7936 false); |
| 7936 | 7937 |
| 7937 ExecuteCalculateDrawProperties(root); | 7938 ExecuteCalculateDrawProperties(root); |
| 7938 | 7939 |
| 7939 EXPECT_EQ(gfx::Rect(30, 30), test_layer->clip_rect()); | 7940 EXPECT_EQ(gfx::Rect(30, 30), test_layer->clip_rect()); |
| 7940 } | 7941 } |
| 7941 | 7942 |
| 7942 } // namespace | 7943 } // namespace |
| 7943 } // namespace cc | 7944 } // namespace cc |
| OLD | NEW |