Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(384)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 1921503005: cc: Move main thread hierarchy dependencies into PropertyTreeBuilder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_common.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 99dca321257e747e76f2f2b02bad2c765aec64c7..ea9defbe83d668f9d89205ce829be8b9be757c10 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -1112,7 +1112,7 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceWithSublayerScale) {
root, root->bounds(), translate, &render_surface_layer_list_impl);
inputs.device_scale_factor = device_scale_factor;
inputs.property_trees->needs_rebuild = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
// Between grand_child and render_surface, we translate by (10, 10) and scale
// by a factor of 2.
@@ -1146,7 +1146,7 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root, root->bounds(), translate, &render_surface_layer_list_impl);
inputs.property_trees->needs_rebuild = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_EQ(translate, root->draw_properties().target_space_transform);
EXPECT_EQ(translate, child->draw_properties().target_space_transform);
EXPECT_EQ(identity_matrix, root->render_surface()->draw_transform());
@@ -1159,7 +1159,7 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root, root->bounds(), scale, &render_surface_layer_list_impl);
inputs.property_trees->needs_rebuild = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_EQ(scale, root->draw_properties().target_space_transform);
EXPECT_EQ(scale, child->draw_properties().target_space_transform);
EXPECT_EQ(identity_matrix, root->render_surface()->draw_transform());
@@ -1172,7 +1172,7 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root, root->bounds(), rotate, &render_surface_layer_list_impl);
inputs.property_trees->needs_rebuild = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_EQ(rotate, root->draw_properties().target_space_transform);
EXPECT_EQ(rotate, child->draw_properties().target_space_transform);
EXPECT_EQ(identity_matrix, root->render_surface()->draw_transform());
@@ -1187,7 +1187,7 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root, root->bounds(), composite, &render_surface_layer_list_impl);
inputs.property_trees->needs_rebuild = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_EQ(composite, root->draw_properties().target_space_transform);
EXPECT_EQ(composite, child->draw_properties().target_space_transform);
EXPECT_EQ(identity_matrix, root->render_surface()->draw_transform());
@@ -1202,7 +1202,7 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
root, root->bounds(), translate, &render_surface_layer_list_impl);
inputs.device_scale_factor = device_scale_factor;
inputs.property_trees->needs_rebuild = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
gfx::Transform device_scaled_translate = translate;
device_scaled_translate.Scale(device_scale_factor, device_scale_factor);
EXPECT_EQ(device_scaled_translate,
@@ -1222,7 +1222,7 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_layer = root;
inputs.property_trees->needs_rebuild = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
gfx::Transform page_scaled_translate = translate;
page_scaled_translate.Scale(page_scale_factor, page_scale_factor);
EXPECT_EQ(page_scaled_translate,
@@ -1240,7 +1240,7 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root, root->bounds(), composite, &render_surface_layer_list_impl);
inputs.property_trees->needs_rebuild = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
gfx::Transform compositeSquared = composite;
compositeSquared.ConcatTransform(composite);
EXPECT_TRANSFORMATION_MATRIX_EQ(
@@ -1300,7 +1300,7 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceListForTransparentChild) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
parent, parent->bounds(), &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
// Since the layer is transparent, render_surface1->render_surface() should
// not have gotten added anywhere. Also, the drawable content rect should not
@@ -1341,7 +1341,7 @@ TEST_F(LayerTreeHostCommonTest,
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
parent, parent->bounds(), &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_EQ(2U, render_surface_layer_list.size());
}
// The layer is fully transparent, but has a background filter, so it
@@ -1364,7 +1364,7 @@ TEST_F(LayerTreeHostCommonTest,
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
parent, parent->bounds(), &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
}
node = effect_tree.Node(render_surface1->effect_tree_index());
@@ -1402,7 +1402,7 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceListForFilter) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root, root->bounds(), &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
ASSERT_TRUE(parent->render_surface());
EXPECT_EQ(2U, parent->render_surface()->layer_list().size());
@@ -3438,7 +3438,7 @@ TEST_F(LayerTreeHostCommonTest,
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root, gfx::Size(), &render_surface_layer_list_impl);
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
ASSERT_TRUE(root->render_surface());
EXPECT_FALSE(root->is_clipped());
@@ -5201,7 +5201,7 @@ TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root_layer, root_layer->bounds(), &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
// We should have one render surface and two layers. The child
// layer should be included even though it is transparent.
@@ -5216,7 +5216,7 @@ TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs2(
root_layer, root_layer->bounds(), &render_surface_layer_list2);
inputs2.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs2);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs2);
LayerImpl* child_ptr = root_layer->layer_tree_impl()->LayerById(2);
EffectTree& tree =
@@ -5233,7 +5233,7 @@ TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs3(
root_layer, root_layer->bounds(), &render_surface_layer_list3);
inputs3.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs3);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs3);
child_ptr = root_layer->layer_tree_impl()->LayerById(2);
tree = root_layer->layer_tree_impl()->property_trees()->effect_tree;
@@ -5531,7 +5531,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root_layer, root_layer->bounds(), &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
// We should have one render surface and two layers. The grand child has
// hidden itself.
@@ -5581,7 +5581,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root_layer, root_layer->bounds(), &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
// We should have one render surface and one layers. The child has
// hidden itself and the grand child.
@@ -5694,7 +5694,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root_layer, root_layer->bounds(), &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_GT(root_layer->num_copy_requests_in_target_subtree(), 0);
EXPECT_GT(copy_grand_parent_layer->num_copy_requests_in_target_subtree(), 0);
@@ -5807,7 +5807,7 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root_layer, root_layer->bounds(), &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
// We should have two render surface, as the others are clipped out.
ASSERT_EQ(2u, render_surface_layer_list.size());
@@ -6329,7 +6329,7 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root_layer, root_layer->bounds(), &render_surface_layer_list);
inputs.can_render_to_separate_surface = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_EQ(2u, render_surface_layer_list.size());
@@ -6360,7 +6360,7 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root_layer, root_layer->bounds(), &render_surface_layer_list);
inputs.can_render_to_separate_surface = false;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_EQ(1u, render_surface_layer_list.size());
@@ -6650,7 +6650,7 @@ TEST_F(LayerTreeHostCommonTest, ScrollChildAndScrollParentDifferentTargets) {
root, root->bounds(), identity_transform,
&render_surface_layer_list_impl);
inputs.device_scale_factor = device_scale_factor;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_EQ(scroll_child->effect_tree_index(),
scroll_child_target->effect_tree_index());
@@ -7085,7 +7085,7 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
root->layer_tree_impl()
->property_trees()
->transform_tree.set_source_to_parent_updates_allowed(false);
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_TRANSFORMATION_MATRIX_EQ(
container_layer->draw_properties().screen_space_transform,
@@ -7110,7 +7110,7 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root, root->bounds(), &render_surface_layer_list);
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_TRANSFORMATION_MATRIX_EQ(
container_layer->draw_properties().screen_space_transform,
@@ -7138,7 +7138,7 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root, root->bounds(), &render_surface_layer_list);
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_TRANSFORMATION_MATRIX_EQ(
container_layer->draw_properties().screen_space_transform,
@@ -7932,7 +7932,7 @@ TEST_F(LayerTreeHostCommonTest, DrawPropertyScales) {
inputs.page_scale_factor = page_scale_factor;
inputs.can_adjust_raster_scales = true;
inputs.page_scale_layer = root_layer;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_FLOAT_EQ(3.f, root_layer->GetIdealContentsScale());
EXPECT_FLOAT_EQ(9.f, child1_layer->GetIdealContentsScale());
@@ -7965,7 +7965,7 @@ TEST_F(LayerTreeHostCommonTest, DrawPropertyScales) {
inputs.device_scale_factor = device_scale_factor;
inputs.can_adjust_raster_scales = true;
root_layer->layer_tree_impl()->property_trees()->needs_rebuild = true;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_FLOAT_EQ(12.f, root_layer->GetIdealContentsScale());
EXPECT_FLOAT_EQ(36.f, child1_layer->GetIdealContentsScale());
@@ -8019,7 +8019,7 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInChildRenderSurface) {
inputs.device_scale_factor = 2.f;
inputs.page_scale_factor = 1.f;
inputs.page_scale_layer = NULL;
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
// Layers in the root render surface have their visible content rect clipped
// by the viewport.
@@ -8081,11 +8081,11 @@ TEST_F(LayerTreeHostCommonTest, BoundsDeltaAffectVisibleContentRect) {
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
root, device_viewport_size, &layer_impl_list);
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
EXPECT_EQ(gfx::Rect(root_size), sublayer->visible_layer_rect());
root->SetBoundsDelta(gfx::Vector2dF(0.0, 50.0));
- LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+ LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
gfx::Rect affected_by_delta(0, 0, root_size.width(),
root_size.height() + 50);
« no previous file with comments | « cc/trees/layer_tree_host_common.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698