| Index: cc/test/layer_tree_host_common_test.cc
|
| diff --git a/cc/test/layer_tree_host_common_test.cc b/cc/test/layer_tree_host_common_test.cc
|
| index 41426a71f03805e867aaef4249bb066115853f2c..f8d1353926f715c685bcc05daa96740be3343a82 100644
|
| --- a/cc/test/layer_tree_host_common_test.cc
|
| +++ b/cc/test/layer_tree_host_common_test.cc
|
| @@ -103,6 +103,7 @@ void LayerTreeHostCommonTestBase::
|
| root_layer, page_scale_layer, inner_viewport_scroll_layer,
|
| outer_viewport_scroll_layer, page_scale_factor, device_scale_factor,
|
| gfx::Rect(device_viewport_size), identity_transform,
|
| + can_render_to_separate_surface,
|
| root_layer->layer_tree_host()->property_trees(), &update_layer_list_);
|
| }
|
|
|
| @@ -112,6 +113,7 @@ void LayerTreeHostCommonTestBase::
|
| LayerTreeHostCommon::PreCalculateMetaInformationForTesting(root_layer);
|
|
|
| gfx::Transform identity_transform;
|
| + bool can_render_to_separate_surface = true;
|
| LayerImpl* page_scale_layer = nullptr;
|
| LayerImpl* inner_viewport_scroll_layer =
|
| root_layer->layer_tree_impl()->InnerViewportScrollLayer();
|
| @@ -127,6 +129,7 @@ void LayerTreeHostCommonTestBase::
|
| root_layer, page_scale_layer, inner_viewport_scroll_layer,
|
| outer_viewport_scroll_layer, page_scale_factor, device_scale_factor,
|
| gfx::Rect(device_viewport_size), identity_transform,
|
| + can_render_to_separate_surface,
|
| root_layer->layer_tree_impl()->property_trees(), &update_layer_list);
|
| }
|
|
|
| @@ -166,6 +169,27 @@ void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
|
| LayerTreeHostCommon::CalculateDrawProperties(&inputs);
|
| }
|
|
|
| +void LayerTreeHostCommonTestBase::
|
| + ExecuteCalculateDrawPropertiesWithoutSeparateSurfaces(
|
| + LayerImpl* root_layer) {
|
| + gfx::Transform identity_matrix;
|
| + gfx::Size device_viewport_size =
|
| + gfx::Size(root_layer->bounds().width(), root_layer->bounds().height());
|
| + render_surface_layer_list_impl_.reset(new LayerImplList);
|
| +
|
| + DCHECK(!root_layer->bounds().IsEmpty());
|
| + LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
|
| + root_layer, device_viewport_size, render_surface_layer_list_impl_.get());
|
| + inputs.can_adjust_raster_scales = true;
|
| + inputs.can_render_to_separate_surface = false;
|
| +
|
| + ++render_surface_layer_list_count_;
|
| + inputs.current_render_surface_layer_list_id =
|
| + render_surface_layer_list_count_;
|
| +
|
| + LayerTreeHostCommon::CalculateDrawProperties(&inputs);
|
| +}
|
| +
|
| bool LayerTreeHostCommonTestBase::UpdateLayerListContains(int id) const {
|
| for (size_t i = 0; i < update_layer_list_.size(); ++i) {
|
| if (update_layer_list_[i]->id() == id)
|
|
|