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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <memory> | 10 #include <memory> |
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1274 float device_scale_factor = 1.5f; | 1274 float device_scale_factor = 1.5f; |
1275 | 1275 |
1276 { | 1276 { |
1277 LayerImplList render_surface_layer_list_impl; | 1277 LayerImplList render_surface_layer_list_impl; |
1278 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( | 1278 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( |
1279 root, root->bounds(), translate, &render_surface_layer_list_impl); | 1279 root, root->bounds(), translate, &render_surface_layer_list_impl); |
1280 inputs.device_scale_factor = device_scale_factor; | 1280 inputs.device_scale_factor = device_scale_factor; |
1281 inputs.property_trees->needs_rebuild = true; | 1281 inputs.property_trees->needs_rebuild = true; |
1282 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); | 1282 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); |
1283 gfx::Transform device_scaled_translate = translate; | 1283 gfx::Transform device_scaled_translate = translate; |
1284 device_scaled_translate.Scale(device_scale_factor, device_scale_factor); | 1284 device_scaled_translate.matrix().postScale(device_scale_factor, |
| 1285 device_scale_factor, 1.f); |
1285 EXPECT_TRANSFORMATION_MATRIX_EQ( | 1286 EXPECT_TRANSFORMATION_MATRIX_EQ( |
1286 device_scaled_translate, | 1287 device_scaled_translate, |
1287 root->draw_properties().target_space_transform); | 1288 root->draw_properties().target_space_transform); |
1288 EXPECT_TRANSFORMATION_MATRIX_EQ( | 1289 EXPECT_TRANSFORMATION_MATRIX_EQ( |
1289 device_scaled_translate, | 1290 device_scaled_translate, |
1290 child->draw_properties().target_space_transform); | 1291 child->draw_properties().target_space_transform); |
1291 EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), | 1292 EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), |
1292 root->render_surface()->draw_transform()); | 1293 root->render_surface()->draw_transform()); |
1293 } | 1294 } |
1294 | 1295 |
1295 // Verify it composes correctly with page scale. | 1296 // Verify it composes correctly with page scale. |
1296 float page_scale_factor = 2.f; | 1297 float page_scale_factor = 2.f; |
1297 | 1298 |
1298 { | 1299 { |
1299 LayerImplList render_surface_layer_list_impl; | 1300 LayerImplList render_surface_layer_list_impl; |
1300 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( | 1301 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( |
1301 root, root->bounds(), translate, &render_surface_layer_list_impl); | 1302 root, root->bounds(), translate, &render_surface_layer_list_impl); |
1302 inputs.page_scale_factor = page_scale_factor; | 1303 inputs.page_scale_factor = page_scale_factor; |
1303 inputs.page_scale_layer = root; | 1304 inputs.page_scale_layer = root; |
1304 inputs.property_trees->needs_rebuild = true; | 1305 inputs.property_trees->needs_rebuild = true; |
1305 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); | 1306 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); |
1306 gfx::Transform page_scaled_translate = translate; | 1307 gfx::Transform page_scaled_translate = translate; |
1307 page_scaled_translate.Scale(page_scale_factor, page_scale_factor); | 1308 page_scaled_translate.matrix().postScale(page_scale_factor, |
| 1309 page_scale_factor, 1.f); |
1308 EXPECT_TRANSFORMATION_MATRIX_EQ( | 1310 EXPECT_TRANSFORMATION_MATRIX_EQ( |
1309 page_scaled_translate, root->draw_properties().target_space_transform); | 1311 page_scaled_translate, root->draw_properties().target_space_transform); |
1310 EXPECT_TRANSFORMATION_MATRIX_EQ( | 1312 EXPECT_TRANSFORMATION_MATRIX_EQ( |
1311 page_scaled_translate, child->draw_properties().target_space_transform); | 1313 page_scaled_translate, child->draw_properties().target_space_transform); |
1312 EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), | 1314 EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), |
1313 root->render_surface()->draw_transform()); | 1315 root->render_surface()->draw_transform()); |
1314 } | 1316 } |
1315 | 1317 |
1316 // Verify that it composes correctly with transforms directly on root layer. | 1318 // Verify that it composes correctly with transforms directly on root layer. |
1317 root->test_properties()->transform = composite; | 1319 root->test_properties()->transform = composite; |
(...skipping 8801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
10119 EXPECT_EQ(scroll_child6.id, grand_child10->scroll_tree_index()); | 10121 EXPECT_EQ(scroll_child6.id, grand_child10->scroll_tree_index()); |
10120 EXPECT_EQ(scroll_root1.id, parent3->scroll_tree_index()); | 10122 EXPECT_EQ(scroll_root1.id, parent3->scroll_tree_index()); |
10121 EXPECT_EQ(scroll_child7.id, child8->scroll_tree_index()); | 10123 EXPECT_EQ(scroll_child7.id, child8->scroll_tree_index()); |
10122 EXPECT_EQ(scroll_root1.id, parent4->scroll_tree_index()); | 10124 EXPECT_EQ(scroll_root1.id, parent4->scroll_tree_index()); |
10123 EXPECT_EQ(scroll_root1.id, child9->scroll_tree_index()); | 10125 EXPECT_EQ(scroll_root1.id, child9->scroll_tree_index()); |
10124 EXPECT_EQ(scroll_root1.id, grand_child12->scroll_tree_index()); | 10126 EXPECT_EQ(scroll_root1.id, grand_child12->scroll_tree_index()); |
10125 } | 10127 } |
10126 | 10128 |
10127 } // namespace | 10129 } // namespace |
10128 } // namespace cc | 10130 } // namespace cc |
OLD | NEW |