Chromium Code Reviews Chromium Code Reviews
Issue 295193002:
Get rid of graphics layer anchor points, and replace with transform origin. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| Index: cc/trees/layer_tree_host_common_unittest.cc |
| diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc |
| index 43d94da6d9a9dc166ddad829fdaba93e04a39a10..55235d5664b7657ca899c200bfb634dd09b0bf22 100644 |
| --- a/cc/trees/layer_tree_host_common_unittest.cc |
| +++ b/cc/trees/layer_tree_host_common_unittest.cc |
| @@ -125,21 +125,21 @@ TEST_F(LayerTreeHostCommonTest, TransformsForNoOpLayer) { |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(), |
| true, |
| @@ -163,7 +163,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) { |
| scoped_refptr<Layer> root = Layer::Create(); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| @@ -179,7 +179,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) { |
| translation_to_center.Translate(5.0, 6.0); |
| SetLayerPropertiesForTesting(layer.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 12), |
| true, |
| @@ -193,7 +193,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) { |
| // no effect on the transforms. |
| SetLayerPropertiesForTesting(layer.get(), |
| identity_matrix, |
| - gfx::PointF(0.25f, 0.25f), |
| + gfx::Point3F(2.5f, 3.0f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 12), |
| true, |
| @@ -209,7 +209,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) { |
| position_transform.Translate(0.f, 1.2f); |
| SetLayerPropertiesForTesting(layer.get(), |
| identity_matrix, |
| - gfx::PointF(0.25f, 0.25f), |
| + gfx::Point3F(2.5f, 3.0f, 0.f), |
| gfx::PointF(0.f, 1.2f), |
| gfx::Size(10, 12), |
| true, |
| @@ -226,7 +226,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) { |
| layer_transform.Scale3d(2.0, 2.0, 1.0); |
| SetLayerPropertiesForTesting(layer.get(), |
| layer_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 12), |
| true, |
| @@ -243,7 +243,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) { |
| translation_to_anchor * layer_transform * Inverse(translation_to_anchor); |
| SetLayerPropertiesForTesting(layer.get(), |
| layer_transform, |
| - gfx::PointF(0.5f, 0.f), |
| + gfx::Point3F(5.0f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 12), |
| true, |
| @@ -260,7 +260,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) { |
| layer_transform * Inverse(translation_to_anchor); |
| SetLayerPropertiesForTesting(layer.get(), |
| layer_transform, |
| - gfx::PointF(0.5f, 0.f), |
| + gfx::Point3F(5.0f, 0.f, 0.f), |
| gfx::PointF(0.f, 1.2f), |
| gfx::Size(10, 12), |
| true, |
| @@ -292,7 +292,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsAboutScrollOffset) { |
| kPageScale * kDeviceScale); |
| SetLayerPropertiesForTesting(sublayer, |
| identity_matrix, |
| - gfx::Point(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(500, 500), |
| true, |
| @@ -303,7 +303,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsAboutScrollOffset) { |
| LayerImpl* scroll_layer = scroll_layer_scoped_ptr.get(); |
| SetLayerPropertiesForTesting(scroll_layer, |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 20), |
| true, |
| @@ -327,7 +327,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsAboutScrollOffset) { |
| scoped_ptr<LayerImpl> root(LayerImpl::Create(host_impl.active_tree(), 3)); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(3, 4), |
| true, |
| @@ -352,7 +352,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsAboutScrollOffset) { |
| arbitrary_translate.Translate(kTranslateX, kTranslateY); |
| SetLayerPropertiesForTesting(scroll_layer, |
| arbitrary_translate, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 20), |
| true, |
| @@ -385,7 +385,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) { |
| // One-time setup of root layer |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| @@ -394,21 +394,21 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) { |
| // Case 1: parent's anchor point should not affect child or grand_child. |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(0.25f, 0.25f), |
| + gfx::Point3F(2.5f, 3.0f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 12), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(16, 18), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(76, 78), |
| true, |
| @@ -427,21 +427,21 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) { |
| parent_position_transform.Translate(0.f, 1.2f); |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(0.25f, 0.25f), |
| + gfx::Point3F(2.5f, 3.0f, 0.f), |
| gfx::PointF(0.f, 1.2f), |
| gfx::Size(10, 12), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(16, 18), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(76, 78), |
| true, |
| @@ -466,21 +466,21 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) { |
| Inverse(parent_translation_to_anchor); |
| SetLayerPropertiesForTesting(parent.get(), |
| parent_layer_transform, |
| - gfx::PointF(0.25f, 0.25f), |
| + gfx::Point3F(2.5f, 3.0f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 12), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(16, 18), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(76, 78), |
| true, |
| @@ -513,7 +513,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleRenderSurface) { |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| @@ -545,21 +545,21 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleRenderSurface) { |
| SetLayerPropertiesForTesting(parent.get(), |
| parent_layer_transform, |
| - gfx::PointF(0.25f, 0.25f), |
| + gfx::Point3F(25.0f, 30.0f, 0.f), |
| gfx::PointF(), |
| gfx::Size(100, 120), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(16, 18), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(8, 10), |
| true, |
| @@ -610,7 +610,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForReplica) { |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| @@ -643,28 +643,28 @@ TEST_F(LayerTreeHostCommonTest, TransformsForReplica) { |
| SetLayerPropertiesForTesting(parent.get(), |
| parent_layer_transform, |
| - gfx::PointF(0.25f, 0.25f), |
| + gfx::Point3F(2.5f, 3.0f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 12), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(16, 18), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(-0.5f, -0.5f), |
| gfx::Size(1, 1), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_replica.get(), |
| replica_layer_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(), |
| true, |
| @@ -736,7 +736,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) { |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| @@ -783,77 +783,77 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) { |
| SetLayerPropertiesForTesting(parent.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface2.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_of_root.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_of_rs1.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_of_rs2.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child_of_root.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child_of_rs1.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child_of_rs2.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(replica_of_rs1.get(), |
| replica_layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(), |
| true, |
| false); |
| SetLayerPropertiesForTesting(replica_of_rs2.get(), |
| replica_layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(2.5f, 0.f, 0.f), |
| gfx::PointF(), |
| gfx::Size(), |
| true, |
| @@ -995,21 +995,21 @@ TEST_F(LayerTreeHostCommonTest, TransformsForFlatteningLayer) { |
| const gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| rotation_about_y_axis, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| rotation_about_y_axis, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| @@ -1074,21 +1074,21 @@ TEST_F(LayerTreeHostCommonTest, TransformsForDegenerateIntermediateLayer) { |
| const gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 0), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| @@ -1128,14 +1128,14 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) { |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| @@ -1275,21 +1275,21 @@ TEST_F(LayerTreeHostCommonTest, |
| const gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(30.f, 30.f), |
| gfx::Size(10, 10), |
| true, |
| @@ -1329,14 +1329,14 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceListForTransparentChild) { |
| const gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| @@ -1376,21 +1376,21 @@ TEST_F(LayerTreeHostCommonTest, ForceRenderSurface) { |
| const gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| @@ -1470,42 +1470,42 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsRenderSurfaces) { |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(500, 500), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(45.f, 45.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(great_grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(leaf_node1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(500, 500), |
| true, |
| false); |
| SetLayerPropertiesForTesting(leaf_node2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| @@ -1562,28 +1562,28 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsSurfaceWithoutVisibleContent) { |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(200.f, 200.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(leaf_node.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| @@ -1666,49 +1666,49 @@ TEST_F(LayerTreeHostCommonTest, IsClippedIsSetCorrectly) { |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(leaf_node1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(leaf_node2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| @@ -1822,42 +1822,42 @@ TEST_F(LayerTreeHostCommonTest, DrawableContentRectForLayers) { |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(500, 500), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(15.f, 15.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child3.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(15.f, 15.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child4.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(45.f, 45.f), |
| gfx::Size(10, 10), |
| true, |
| @@ -1930,70 +1930,70 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) { |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(500, 500), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(15.f, 15.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child3.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(15.f, 15.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child4.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(45.f, 45.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(leaf_node1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(leaf_node2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(leaf_node3.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(leaf_node4.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| @@ -2067,63 +2067,63 @@ TEST_F(LayerTreeHostCommonTest, AnimationsForRenderSurfaceHierarchy) { |
| SetLayerPropertiesForTesting(parent.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(0.25f, 0.f, 0.f), |
| gfx::PointF(2.5f, 0.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(0.25f, 0.f, 0.f), |
| gfx::PointF(2.5f, 0.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface2.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(0.25f, 0.f, 0.f), |
| gfx::PointF(2.5f, 0.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_of_root.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(0.25f, 0.f, 0.f), |
| gfx::PointF(2.5f, 0.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_of_rs1.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(0.25f, 0.f, 0.f), |
| gfx::PointF(2.5f, 0.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_of_rs2.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(0.25f, 0.f, 0.f), |
| gfx::PointF(2.5f, 0.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child_of_root.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(0.25f, 0.f, 0.f), |
| gfx::PointF(2.5f, 0.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child_of_rs1.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(0.25f, 0.f, 0.f), |
| gfx::PointF(2.5f, 0.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child_of_rs2.get(), |
| layer_transform, |
| - gfx::PointF(0.25f, 0.f), |
| + gfx::Point3F(0.25f, 0.f, 0.f), |
| gfx::PointF(2.5f, 0.f), |
| gfx::Size(10, 10), |
| true, |
| @@ -2549,28 +2549,28 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsForSimpleLayers) { |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(75.f, 75.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child3.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(125.f, 125.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -2617,35 +2617,35 @@ TEST_F(LayerTreeHostCommonTest, |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(75.f, 75.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child3.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(125.f, 125.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -2698,35 +2698,35 @@ TEST_F(LayerTreeHostCommonTest, |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(3, 4), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(75.f, 75.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child3.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(125.f, 125.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -2778,14 +2778,14 @@ TEST_F(LayerTreeHostCommonTest, |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| uninvertible_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -2804,7 +2804,7 @@ TEST_F(LayerTreeHostCommonTest, |
| SetLayerPropertiesForTesting(child.get(), |
| uninvertible_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -2823,7 +2823,7 @@ TEST_F(LayerTreeHostCommonTest, |
| SetLayerPropertiesForTesting(child.get(), |
| uninvertible_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -2851,14 +2851,14 @@ TEST_F(LayerTreeHostCommonTest, |
| SetLayerPropertiesForTesting(root.get(), |
| uninvertible_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -2895,7 +2895,7 @@ TEST_F(LayerTreeHostCommonTest, |
| SetLayerPropertiesForTesting(root.get(), |
| uninvertible_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| @@ -2931,35 +2931,35 @@ TEST_F(LayerTreeHostCommonTest, |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(3, 4), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(75.f, 75.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child3.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(125.f, 125.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -3021,42 +3021,42 @@ TEST_F(LayerTreeHostCommonTest, |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(3, 4), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(7, 13), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(75.f, 75.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child3.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(125.f, 125.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -3123,21 +3123,21 @@ TEST_F(LayerTreeHostCommonTest, |
| child_rotation.Rotate(45.0); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(3, 4), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child1.get(), |
| child_rotation, |
| - gfx::PointF(0.5f, 0.5f), |
| + gfx::Point3F(25, 25, 0.f), |
| gfx::PointF(25.f, 25.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -3194,21 +3194,22 @@ TEST_F(LayerTreeHostCommonTest, |
| child_rotation.Rotate(45.0); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(3, 4), |
| true, |
| false); |
| + LOG(ERROR) << child1->bounds().height(); |
|
enne (OOO)
2014/06/03 22:25:52
ಠ_à²
chrishtr
2014/06/03 23:14:54
Done.
|
| SetLayerPropertiesForTesting(child1.get(), |
| child_rotation, |
| - gfx::PointF(0.5f, 0.5f), |
| + gfx::Point3F(25, 25, 0.f), |
| gfx::PointF(25.f, 25.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -3266,42 +3267,42 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsInHighDPI) { |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(3, 4), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(7, 13), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5.f, 5.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(75.f, 75.f), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child3.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(125.f, 125.f), |
| gfx::Size(50, 50), |
| true, |
| @@ -3414,63 +3415,63 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) { |
| // back-face culling. |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(front_facing_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(back_facing_child.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(front_facing_surface.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(back_facing_surface.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(front_facing_child_of_front_facing_surface.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(back_facing_child_of_front_facing_surface.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(front_facing_child_of_back_facing_surface.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(back_facing_child_of_back_facing_surface.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| @@ -3624,21 +3625,21 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithPreserves3d) { |
| // and (b) the layer's transform style is preserve-3d. |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); // parent transform style is flat. |
| SetLayerPropertiesForTesting(front_facing_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(back_facing_child.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| @@ -3646,7 +3647,7 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithPreserves3d) { |
| // surface transform style is preserve-3d. |
| SetLayerPropertiesForTesting(front_facing_surface.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| @@ -3654,35 +3655,35 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithPreserves3d) { |
| // surface transform style is preserve-3d. |
| SetLayerPropertiesForTesting(back_facing_surface.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| true); |
| SetLayerPropertiesForTesting(front_facing_child_of_front_facing_surface.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| true); |
| SetLayerPropertiesForTesting(back_facing_child_of_front_facing_surface.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| true); |
| SetLayerPropertiesForTesting(front_facing_child_of_back_facing_surface.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| true); |
| SetLayerPropertiesForTesting(back_facing_child_of_back_facing_surface.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| @@ -3786,42 +3787,42 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithAnimatingTransforms) { |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(animating_surface.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_of_animating_surface.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(animating_child.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| @@ -3919,35 +3920,35 @@ TEST_F(LayerTreeHostCommonTest, |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| true); // parent transform style is preserve3d. |
| SetLayerPropertiesForTesting(front_facing_surface.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| true); // surface transform style is flat. |
| SetLayerPropertiesForTesting(back_facing_surface.get(), |
| backface_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| true); // surface transform style is flat. |
| SetLayerPropertiesForTesting(child1.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child2.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| @@ -4042,7 +4043,7 @@ TEST_F(LayerTreeHostCommonTest, LayerTransformsInHighDPI) { |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| @@ -4051,7 +4052,7 @@ TEST_F(LayerTreeHostCommonTest, LayerTransformsInHighDPI) { |
| scoped_refptr<ContentLayer> child = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4061,7 +4062,7 @@ TEST_F(LayerTreeHostCommonTest, LayerTransformsInHighDPI) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_empty.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(), |
| false, |
| @@ -4071,7 +4072,7 @@ TEST_F(LayerTreeHostCommonTest, LayerTransformsInHighDPI) { |
| CreateNoScaleDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_no_scale.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4186,7 +4187,7 @@ TEST_F(LayerTreeHostCommonTest, SurfaceLayerTransformsInHighDPI) { |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| @@ -4196,7 +4197,7 @@ TEST_F(LayerTreeHostCommonTest, SurfaceLayerTransformsInHighDPI) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(perspective_surface.get(), |
| perspective_matrix * scale_small_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4206,7 +4207,7 @@ TEST_F(LayerTreeHostCommonTest, SurfaceLayerTransformsInHighDPI) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(scale_surface.get(), |
| scale_small_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4290,7 +4291,7 @@ TEST_F(LayerTreeHostCommonTest, |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(133, 133), |
| false, |
| @@ -4299,7 +4300,7 @@ TEST_F(LayerTreeHostCommonTest, |
| scoped_refptr<ContentLayer> child = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(13, 13), |
| false, |
| @@ -4309,7 +4310,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateNoScaleDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_no_scale.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(13, 13), |
| false, |
| @@ -4414,7 +4415,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) { |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| parent_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| @@ -4424,7 +4425,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4434,7 +4435,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_empty.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(), |
| false, |
| @@ -4444,7 +4445,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) { |
| CreateNoScaleDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_no_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(12.f, 12.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4598,7 +4599,7 @@ TEST_F(LayerTreeHostCommonTest, |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| parent_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| @@ -4608,7 +4609,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4618,7 +4619,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_empty.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(), |
| false, |
| @@ -4628,7 +4629,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateNoScaleDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_no_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(12.f, 12.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4702,7 +4703,7 @@ TEST_F(LayerTreeHostCommonTest, SmallContentsScale) { |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| parent_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| @@ -4712,7 +4713,7 @@ TEST_F(LayerTreeHostCommonTest, SmallContentsScale) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4791,7 +4792,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) { |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| parent_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| @@ -4801,7 +4802,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4811,7 +4812,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_scale_child_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| false, |
| @@ -4821,7 +4822,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) { |
| CreateNoScaleDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_scale_child_no_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| false, |
| @@ -4831,7 +4832,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) { |
| CreateNoScaleDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_no_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(12.f, 12.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -4841,7 +4842,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_no_scale_child_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| false, |
| @@ -4851,7 +4852,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) { |
| CreateNoScaleDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_no_scale_child_no_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| false, |
| @@ -4992,7 +4993,7 @@ TEST_F(LayerTreeHostCommonTest, |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| parent_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| @@ -5002,7 +5003,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -5012,7 +5013,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_scale_child_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| false, |
| @@ -5022,7 +5023,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateNoScaleDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_scale_child_no_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| false, |
| @@ -5032,7 +5033,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateNoScaleDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_no_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(12.f, 12.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -5042,7 +5043,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_no_scale_child_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| false, |
| @@ -5052,7 +5053,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateNoScaleDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(surface_no_scale_child_no_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| false, |
| @@ -5194,7 +5195,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForAnimatingLayer) { |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| parent_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| false, |
| @@ -5204,7 +5205,7 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForAnimatingLayer) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child_scale.get(), |
| child_scale_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -5265,14 +5266,14 @@ TEST_F(LayerTreeHostCommonTest, |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| @@ -5311,7 +5312,7 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceTransformsInHighDPI) { |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| false, |
| @@ -5320,7 +5321,7 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceTransformsInHighDPI) { |
| scoped_refptr<ContentLayer> child = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -5331,7 +5332,7 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceTransformsInHighDPI) { |
| scoped_refptr<ContentLayer> replica = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(replica.get(), |
| replica_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(2.f, 2.f), |
| gfx::Size(10, 10), |
| false, |
| @@ -5343,7 +5344,7 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceTransformsInHighDPI) { |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(duplicate_child_non_owner.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| false, |
| @@ -5446,7 +5447,7 @@ TEST_F(LayerTreeHostCommonTest, |
| scoped_refptr<ContentLayer> parent = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(33, 31), |
| false, |
| @@ -5455,7 +5456,7 @@ TEST_F(LayerTreeHostCommonTest, |
| scoped_refptr<ContentLayer> child = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(13, 11), |
| false, |
| @@ -5466,7 +5467,7 @@ TEST_F(LayerTreeHostCommonTest, |
| scoped_refptr<ContentLayer> replica = CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(replica.get(), |
| replica_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(13, 11), |
| false, |
| @@ -5478,7 +5479,7 @@ TEST_F(LayerTreeHostCommonTest, |
| CreateDrawableContentLayer(&delegate); |
| SetLayerPropertiesForTesting(duplicate_child_non_owner.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(13, 11), |
| false, |
| @@ -5583,21 +5584,21 @@ TEST_F(LayerTreeHostCommonTest, TransparentChildRenderSurfaceCreation) { |
| const gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| @@ -5625,7 +5626,7 @@ TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) { |
| const gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(100, 100), |
| true, |
| @@ -5635,7 +5636,7 @@ TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) { |
| scoped_ptr<LayerImpl> child = LayerImpl::Create(host_impl.pending_tree(), 2); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -5678,21 +5679,21 @@ class LCDTextTest |
| gfx::Transform identity_matrix; |
| SetLayerPropertiesForTesting(root_.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 1), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 1), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child_.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 1), |
| true, |
| @@ -5825,7 +5826,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayer) { |
| scoped_refptr<Layer> root = Layer::Create(); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -5835,7 +5836,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayer) { |
| scoped_refptr<Layer> child = Layer::Create(); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| @@ -5845,7 +5846,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayer) { |
| scoped_refptr<Layer> grand_child = Layer::Create(); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| @@ -5883,7 +5884,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) { |
| scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl.pending_tree(), 1); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -5893,7 +5894,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) { |
| scoped_ptr<LayerImpl> child = LayerImpl::Create(host_impl.pending_tree(), 2); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| @@ -5904,7 +5905,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) { |
| LayerImpl::Create(host_impl.pending_tree(), 3); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| @@ -5939,7 +5940,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayers) { |
| scoped_refptr<Layer> root = Layer::Create(); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -5949,7 +5950,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayers) { |
| scoped_refptr<Layer> child = Layer::Create(); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| @@ -5960,7 +5961,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayers) { |
| scoped_refptr<Layer> grand_child = Layer::Create(); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| @@ -5996,7 +5997,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) { |
| scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl.pending_tree(), 1); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -6006,7 +6007,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) { |
| scoped_ptr<LayerImpl> child = LayerImpl::Create(host_impl.pending_tree(), 2); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| @@ -6018,7 +6019,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) { |
| LayerImpl::Create(host_impl.pending_tree(), 3); |
| SetLayerPropertiesForTesting(grand_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| @@ -6053,7 +6054,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) { |
| scoped_refptr<Layer> root = Layer::Create(); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -6063,7 +6064,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) { |
| scoped_refptr<Layer> copy_grand_parent = Layer::Create(); |
| SetLayerPropertiesForTesting(copy_grand_parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| @@ -6073,7 +6074,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) { |
| scoped_refptr<Layer> copy_parent = Layer::Create(); |
| SetLayerPropertiesForTesting(copy_parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| @@ -6084,7 +6085,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) { |
| scoped_refptr<Layer> copy_layer = Layer::Create(); |
| SetLayerPropertiesForTesting(copy_layer.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| @@ -6094,7 +6095,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) { |
| scoped_refptr<Layer> copy_child = Layer::Create(); |
| SetLayerPropertiesForTesting(copy_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| @@ -6104,7 +6105,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) { |
| scoped_refptr<Layer> copy_grand_parent_sibling_before = Layer::Create(); |
| SetLayerPropertiesForTesting(copy_grand_parent_sibling_before.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| @@ -6114,7 +6115,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) { |
| scoped_refptr<Layer> copy_grand_parent_sibling_after = Layer::Create(); |
| SetLayerPropertiesForTesting(copy_grand_parent_sibling_after.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| @@ -6200,7 +6201,7 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) { |
| scoped_refptr<Layer> root = Layer::Create(); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -6210,7 +6211,7 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) { |
| scoped_refptr<Layer> copy_parent = Layer::Create(); |
| SetLayerPropertiesForTesting(copy_parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(), |
| true, |
| @@ -6221,7 +6222,7 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) { |
| scoped_refptr<Layer> copy_layer = Layer::Create(); |
| SetLayerPropertiesForTesting(copy_layer.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| @@ -6231,7 +6232,7 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) { |
| scoped_refptr<Layer> copy_child = Layer::Create(); |
| SetLayerPropertiesForTesting(copy_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| @@ -6275,7 +6276,7 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInsideSurface) { |
| scoped_refptr<Layer> root = Layer::Create(); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -6286,7 +6287,7 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInsideSurface) { |
| scoped_refptr<Layer> surface = Layer::Create(); |
| SetLayerPropertiesForTesting(surface.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(-10, -20), |
| gfx::Size(), |
| true, |
| @@ -6296,7 +6297,7 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInsideSurface) { |
| scoped_refptr<Layer> surface_child = Layer::Create(); |
| SetLayerPropertiesForTesting(surface_child.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -6359,35 +6360,35 @@ TEST_F(LayerTreeHostCommonTest, TransformedClipParent) { |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(clip_parent.get(), |
| scale_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(1.f, 1.f), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(intervening.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(1.f, 1.f), |
| gfx::Size(5, 5), |
| true, |
| false); |
| SetLayerPropertiesForTesting(clip_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(1.f, 1.f), |
| gfx::Size(10, 10), |
| true, |
| @@ -6463,42 +6464,42 @@ TEST_F(LayerTreeHostCommonTest, ClipParentWithInterveningRenderSurface) { |
| gfx::Transform identity_transform; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(clip_parent.get(), |
| translation_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(1.f, 1.f), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(intervening.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(1.f, 1.f), |
| gfx::Size(5, 5), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface2.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(clip_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(-10.f, -10.f), |
| gfx::Size(60, 60), |
| true, |
| @@ -6592,42 +6593,42 @@ TEST_F(LayerTreeHostCommonTest, ClipParentScrolledInterveningLayer) { |
| gfx::Transform identity_transform; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(clip_parent.get(), |
| translation_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(1.f, 1.f), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(intervening.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(1.f, 1.f), |
| gfx::Size(5, 5), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface2.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(clip_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(-10.f, -10.f), |
| gfx::Size(60, 60), |
| true, |
| @@ -6708,35 +6709,35 @@ TEST_F(LayerTreeHostCommonTest, DescendantsOfClipChildren) { |
| gfx::Transform identity_transform; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(clip_parent.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(intervening.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(5, 5), |
| true, |
| false); |
| SetLayerPropertiesForTesting(clip_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(60, 60), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(60, 60), |
| true, |
| @@ -6795,42 +6796,42 @@ TEST_F(LayerTreeHostCommonTest, |
| gfx::Transform identity_transform; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(15, 15), |
| true, |
| false); |
| SetLayerPropertiesForTesting(clip_parent.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(5, 5), |
| gfx::Size(5, 5), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface2.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(5, 5), |
| true, |
| false); |
| SetLayerPropertiesForTesting(clip_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(-1, 1), |
| gfx::Size(10, 10), |
| true, |
| false); |
| SetLayerPropertiesForTesting(non_clip_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(5, 5), |
| true, |
| @@ -6890,12 +6891,12 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) { |
| LayerImpl::Create(host_impl.active_tree(), 12345678); |
| gfx::Transform identity_matrix; |
| - gfx::PointF anchor; |
| + gfx::Point3F transform_origin; |
| gfx::PointF position; |
| gfx::Size bounds(100, 100); |
| SetLayerPropertiesForTesting(root.get(), |
| identity_matrix, |
| - anchor, |
| + transform_origin, |
| position, |
| bounds, |
| true, |
| @@ -6906,7 +6907,7 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) { |
| // behavior. |
| SetLayerPropertiesForTesting(child1.get(), |
| identity_matrix, |
| - anchor, |
| + transform_origin, |
| position, |
| bounds, |
| false, |
| @@ -6914,7 +6915,7 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) { |
| child1->SetDrawsContent(true); |
| SetLayerPropertiesForTesting(child2.get(), |
| identity_matrix, |
| - anchor, |
| + transform_origin, |
| position, |
| bounds, |
| true, |
| @@ -6922,7 +6923,7 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) { |
| child2->SetDrawsContent(true); |
| SetLayerPropertiesForTesting(child3.get(), |
| identity_matrix, |
| - anchor, |
| + transform_origin, |
| position, |
| bounds, |
| true, |
| @@ -6969,21 +6970,21 @@ TEST_F(LayerTreeHostCommonTest, DoNotIncludeBackfaceInvisibleSurfaces) { |
| gfx::Transform identity_transform; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| false, |
| true); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| @@ -7051,35 +7052,35 @@ TEST_F(LayerTreeHostCommonTest, ClippedByScrollParent) { |
| gfx::Transform identity_transform; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent_border.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent_clip.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -7111,7 +7112,7 @@ TEST_F(LayerTreeHostCommonTest, SingularTransformSubtreesDoNotDraw) { |
| gfx::Transform identity_transform; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -7119,7 +7120,7 @@ TEST_F(LayerTreeHostCommonTest, SingularTransformSubtreesDoNotDraw) { |
| root->SetForceRenderSurface(true); |
| SetLayerPropertiesForTesting(parent.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| @@ -7127,7 +7128,7 @@ TEST_F(LayerTreeHostCommonTest, SingularTransformSubtreesDoNotDraw) { |
| parent->SetForceRenderSurface(true); |
| SetLayerPropertiesForTesting(child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| @@ -7192,35 +7193,35 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollParent) { |
| gfx::Transform identity_transform; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent_border.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent_clip.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -7284,56 +7285,56 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollGrandparent) { |
| gfx::Transform identity_transform; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_grandparent_border.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_grandparent_clip.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_grandparent.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent_border.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent_clip.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -7419,70 +7420,70 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) { |
| gfx::Transform identity_transform; |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_grandparent_border.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_grandparent_clip.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(20, 20), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_grandparent.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface1.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent_border.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent_clip.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(render_surface2.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -7569,49 +7570,49 @@ TEST_F(LayerTreeHostCommonTest, DoNotClobberSorting) { |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent_border.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent_clip.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_parent.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroll_child.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(top_content.get(), |
| top_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| false, |
| true); |
| SetLayerPropertiesForTesting(bottom_content.get(), |
| bottom_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| false, |
| @@ -7687,28 +7688,28 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) { |
| SetLayerPropertiesForTesting(root.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| false); |
| SetLayerPropertiesForTesting(container.get(), |
| container_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(40, 40), |
| true, |
| false); |
| SetLayerPropertiesForTesting(scroller.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(30, 30), |
| true, |
| false); |
| SetLayerPropertiesForTesting(fixed.get(), |
| identity_transform, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(50, 50), |
| true, |
| @@ -7876,28 +7877,28 @@ TEST_F(LayerTreeHostCommonTest, MaximumAnimationScaleFactor) { |
| SetLayerPropertiesForTesting(grand_parent.get(), |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| false); |
| SetLayerPropertiesForTesting(parent_raw, |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_raw, |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child_raw, |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| @@ -8080,35 +8081,35 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceLayerListMembership) { |
| SetLayerPropertiesForTesting(grand_parent_raw, |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| false); |
| SetLayerPropertiesForTesting(parent_raw, |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| false); |
| SetLayerPropertiesForTesting(child_raw, |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child1_raw, |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
| false); |
| SetLayerPropertiesForTesting(grand_child2_raw, |
| identity_matrix, |
| - gfx::PointF(), |
| + gfx::Point3F(), |
| gfx::PointF(), |
| gfx::Size(1, 2), |
| true, |
