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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_host_unittest_serialization.cc

Issue 2251143002: cc: Reland Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better fix? Created 4 years, 4 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
« cc/test/fake_layer_tree_host.cc ('K') | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | cc/trees/layer_tree_host_unittest_video.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest_serialization.cc
diff --git a/cc/trees/layer_tree_host_unittest_serialization.cc b/cc/trees/layer_tree_host_unittest_serialization.cc
index 008a26dd531b2efb4eedb429b0eff06b0d8dea00..b73123460e7bcf9a73eb1492e01c8f4520bce3ac 100644
--- a/cc/trees/layer_tree_host_unittest_serialization.cc
+++ b/cc/trees/layer_tree_host_unittest_serialization.cc
@@ -109,49 +109,49 @@ class LayerTreeHostSerializationTest : public testing::Test {
layer_tree_host_src_->ToProtobufForCommit(&proto, &swap_promises);
layer_tree_host_dst_->FromProtobufForCommit(proto);
- EXPECT_EQ(layer_tree_host_src_->needs_full_tree_sync_,
- layer_tree_host_dst_->needs_full_tree_sync_);
- EXPECT_EQ(layer_tree_host_src_->needs_meta_info_recomputation_,
- layer_tree_host_dst_->needs_meta_info_recomputation_);
+ EXPECT_EQ(layer_tree_src->needs_full_tree_sync_,
+ layer_tree_dst->needs_full_tree_sync_);
+ EXPECT_EQ(layer_tree_src->needs_meta_info_recomputation_,
+ layer_tree_dst->needs_meta_info_recomputation_);
EXPECT_EQ(layer_tree_host_src_->source_frame_number_,
layer_tree_host_dst_->source_frame_number_);
EXPECT_EQ(layer_tree_host_src_->root_layer()->id(),
layer_tree_host_dst_->root_layer()->id());
EXPECT_EQ(layer_tree_host_dst_.get(),
- layer_tree_host_dst_->root_layer_->layer_tree_host());
- EXPECT_EQ(layer_tree_host_src_->root_layer_->double_sided(),
- layer_tree_host_dst_->root_layer_->double_sided());
+ layer_tree_dst->inputs_.root_layer->layer_tree_host());
+ EXPECT_EQ(layer_tree_src->inputs_.root_layer->double_sided(),
+ layer_tree_dst->inputs_.root_layer->double_sided());
EXPECT_EQ(
layer_tree_host_src_->debug_state_.show_replica_screen_space_rects,
layer_tree_host_dst_->debug_state_.show_replica_screen_space_rects);
- EXPECT_EQ(layer_tree_host_src_->device_viewport_size_,
- layer_tree_host_dst_->device_viewport_size_);
- EXPECT_EQ(layer_tree_host_src_->top_controls_shrink_blink_size_,
- layer_tree_host_dst_->top_controls_shrink_blink_size_);
- EXPECT_EQ(layer_tree_host_src_->top_controls_height_,
- layer_tree_host_dst_->top_controls_height_);
- EXPECT_EQ(layer_tree_host_src_->top_controls_shown_ratio_,
- layer_tree_host_dst_->top_controls_shown_ratio_);
- EXPECT_EQ(layer_tree_host_src_->device_scale_factor_,
- layer_tree_host_dst_->device_scale_factor_);
- EXPECT_EQ(layer_tree_host_src_->painted_device_scale_factor_,
- layer_tree_host_dst_->painted_device_scale_factor_);
- EXPECT_EQ(layer_tree_host_src_->page_scale_factor_,
- layer_tree_host_dst_->page_scale_factor_);
- EXPECT_EQ(layer_tree_host_src_->min_page_scale_factor_,
- layer_tree_host_dst_->min_page_scale_factor_);
- EXPECT_EQ(layer_tree_host_src_->max_page_scale_factor_,
- layer_tree_host_dst_->max_page_scale_factor_);
- EXPECT_EQ(layer_tree_host_src_->elastic_overscroll_,
- layer_tree_host_dst_->elastic_overscroll_);
+ EXPECT_EQ(layer_tree_src->inputs_.device_viewport_size,
+ layer_tree_dst->inputs_.device_viewport_size);
+ EXPECT_EQ(layer_tree_src->inputs_.top_controls_shrink_blink_size,
+ layer_tree_dst->inputs_.top_controls_shrink_blink_size);
+ EXPECT_EQ(layer_tree_src->inputs_.top_controls_height,
+ layer_tree_dst->inputs_.top_controls_height);
+ EXPECT_EQ(layer_tree_src->inputs_.top_controls_shown_ratio,
+ layer_tree_dst->inputs_.top_controls_shown_ratio);
+ EXPECT_EQ(layer_tree_src->inputs_.device_scale_factor,
+ layer_tree_dst->inputs_.device_scale_factor);
+ EXPECT_EQ(layer_tree_src->inputs_.painted_device_scale_factor,
+ layer_tree_dst->inputs_.painted_device_scale_factor);
+ EXPECT_EQ(layer_tree_src->inputs_.page_scale_factor,
+ layer_tree_dst->inputs_.page_scale_factor);
+ EXPECT_EQ(layer_tree_src->inputs_.min_page_scale_factor,
+ layer_tree_dst->inputs_.min_page_scale_factor);
+ EXPECT_EQ(layer_tree_src->inputs_.max_page_scale_factor,
+ layer_tree_dst->inputs_.max_page_scale_factor);
+ EXPECT_EQ(layer_tree_src->elastic_overscroll_,
+ layer_tree_dst->elastic_overscroll_);
EXPECT_EQ(layer_tree_host_src_->has_gpu_rasterization_trigger_,
layer_tree_host_dst_->has_gpu_rasterization_trigger_);
EXPECT_EQ(layer_tree_host_src_->content_is_suitable_for_gpu_rasterization_,
layer_tree_host_dst_->content_is_suitable_for_gpu_rasterization_);
- EXPECT_EQ(layer_tree_host_src_->background_color_,
- layer_tree_host_dst_->background_color_);
- EXPECT_EQ(layer_tree_host_src_->has_transparent_background_,
- layer_tree_host_dst_->has_transparent_background_);
+ EXPECT_EQ(layer_tree_src->inputs_.background_color,
+ layer_tree_dst->inputs_.background_color);
+ EXPECT_EQ(layer_tree_src->inputs_.has_transparent_background,
+ layer_tree_dst->inputs_.has_transparent_background);
EXPECT_EQ(layer_tree_src->in_paint_layer_contents(),
layer_tree_dst->in_paint_layer_contents());
EXPECT_EQ(layer_tree_host_src_->id_, layer_tree_host_dst_->id_);
@@ -162,61 +162,61 @@ class LayerTreeHostSerializationTest : public testing::Test {
layer_tree_dst->LayerById(layer->id())));
}
- if (layer_tree_host_src_->hud_layer_) {
- EXPECT_EQ(layer_tree_host_src_->hud_layer_->id(),
- layer_tree_host_dst_->hud_layer_->id());
+ if (layer_tree_src->hud_layer_) {
+ EXPECT_EQ(layer_tree_src->hud_layer_->id(),
+ layer_tree_dst->hud_layer_->id());
// The HUD layer member is a HeadsUpDisplayLayer instead of Layer, so
// inspect the proto to see if it contains the the right layer type.
bool found_hud_layer_type = false;
- for (int i = 0; i < proto.root_layer().children_size(); ++i) {
- if (proto.root_layer().children(i).id() ==
- layer_tree_host_src_->hud_layer_->id()) {
+ for (int i = 0; i < proto.layer_tree().root_layer().children_size();
+ ++i) {
+ if (proto.layer_tree().root_layer().children(i).id() ==
+ layer_tree_src->hud_layer_->id()) {
EXPECT_EQ(proto::LayerNode::HEADS_UP_DISPLAY_LAYER,
- proto.root_layer().children(i).type());
+ proto.layer_tree().root_layer().children(i).type());
found_hud_layer_type = true;
break;
}
}
EXPECT_TRUE(found_hud_layer_type);
} else {
- EXPECT_FALSE(layer_tree_host_dst_->hud_layer_);
+ EXPECT_FALSE(layer_tree_dst->hud_layer_);
}
- if (layer_tree_host_src_->overscroll_elasticity_layer_) {
- EXPECT_EQ(layer_tree_host_src_->overscroll_elasticity_layer_->id(),
- layer_tree_host_dst_->overscroll_elasticity_layer_->id());
+ if (layer_tree_src->overscroll_elasticity_layer()) {
+ EXPECT_EQ(layer_tree_src->overscroll_elasticity_layer()->id(),
+ layer_tree_dst->overscroll_elasticity_layer()->id());
} else {
- EXPECT_FALSE(layer_tree_host_dst_->overscroll_elasticity_layer_);
+ EXPECT_FALSE(layer_tree_dst->overscroll_elasticity_layer());
}
- if (layer_tree_host_src_->page_scale_layer_) {
- EXPECT_EQ(layer_tree_host_src_->page_scale_layer_->id(),
- layer_tree_host_dst_->page_scale_layer_->id());
+ if (layer_tree_src->page_scale_layer()) {
+ EXPECT_EQ(layer_tree_src->page_scale_layer()->id(),
+ layer_tree_dst->page_scale_layer()->id());
} else {
- EXPECT_FALSE(layer_tree_host_dst_->page_scale_layer_);
+ EXPECT_FALSE(layer_tree_dst->page_scale_layer());
}
- if (layer_tree_host_src_->inner_viewport_scroll_layer_) {
- EXPECT_EQ(layer_tree_host_src_->inner_viewport_scroll_layer_->id(),
- layer_tree_host_dst_->inner_viewport_scroll_layer_->id());
+ if (layer_tree_src->inner_viewport_scroll_layer()) {
+ EXPECT_EQ(layer_tree_src->inner_viewport_scroll_layer()->id(),
+ layer_tree_dst->inner_viewport_scroll_layer()->id());
} else {
- EXPECT_FALSE(layer_tree_host_dst_->inner_viewport_scroll_layer_);
+ EXPECT_FALSE(layer_tree_dst->inner_viewport_scroll_layer());
}
- if (layer_tree_host_src_->outer_viewport_scroll_layer_) {
- EXPECT_EQ(layer_tree_host_src_->outer_viewport_scroll_layer_->id(),
- layer_tree_host_dst_->outer_viewport_scroll_layer_->id());
+ if (layer_tree_src->outer_viewport_scroll_layer()) {
+ EXPECT_EQ(layer_tree_src->outer_viewport_scroll_layer()->id(),
+ layer_tree_dst->outer_viewport_scroll_layer()->id());
} else {
- EXPECT_FALSE(layer_tree_host_dst_->outer_viewport_scroll_layer_);
+ EXPECT_FALSE(layer_tree_dst->outer_viewport_scroll_layer());
}
- EXPECT_EQ(layer_tree_host_src_->selection_,
- layer_tree_host_dst_->selection_);
- EXPECT_EQ(layer_tree_host_src_->property_trees_,
- layer_tree_host_dst_->property_trees_);
+ EXPECT_EQ(layer_tree_src->inputs_.selection,
+ layer_tree_dst->inputs_.selection);
+ EXPECT_EQ(layer_tree_src->property_trees_, layer_tree_dst->property_trees_);
EXPECT_EQ(layer_tree_host_src_->surface_client_id_,
layer_tree_host_dst_->surface_client_id_);
EXPECT_EQ(layer_tree_host_src_->next_surface_sequence_,
layer_tree_host_dst_->next_surface_sequence_);
// All layers must have a property tree index that matches PropertyTrees.
- if (layer_tree_host_dst_->property_trees_.sequence_number) {
- int seq_num = layer_tree_host_dst_->property_trees_.sequence_number;
+ if (layer_tree_dst->property_trees_.sequence_number) {
+ int seq_num = layer_tree_dst->property_trees_.sequence_number;
LayerTreeHostCommon::CallFunctionForEveryLayer(
layer_tree_host_dst_.get(), [seq_num](Layer* layer) {
EXPECT_EQ(seq_num, layer->property_tree_sequence_number());
@@ -225,10 +225,12 @@ class LayerTreeHostSerializationTest : public testing::Test {
}
void RunAllMembersChangedTest() {
- layer_tree_host_src_->needs_full_tree_sync_ =
- !layer_tree_host_src_->needs_full_tree_sync_;
- layer_tree_host_src_->needs_meta_info_recomputation_ =
- !layer_tree_host_src_->needs_meta_info_recomputation_;
+ LayerTree* layer_tree_src = layer_tree_host_src_->GetLayerTree();
+
+ layer_tree_src->needs_full_tree_sync_ =
+ !layer_tree_src->needs_full_tree_sync_;
+ layer_tree_src->needs_meta_info_recomputation_ =
+ !layer_tree_src->needs_meta_info_recomputation_;
layer_tree_host_src_->source_frame_number_ *= 3;
// Just fake setup a layer for both source and dest.
@@ -239,52 +241,54 @@ class LayerTreeHostSerializationTest : public testing::Test {
layer_tree_host_src_->debug_state_.show_replica_screen_space_rects =
!layer_tree_host_src_->debug_state_.show_replica_screen_space_rects;
- layer_tree_host_src_->device_viewport_size_ = gfx::Size(3, 14);
- layer_tree_host_src_->top_controls_shrink_blink_size_ =
- !layer_tree_host_src_->top_controls_shrink_blink_size_;
- layer_tree_host_src_->top_controls_height_ =
- layer_tree_host_src_->top_controls_height_ * 3 + 1;
- layer_tree_host_src_->top_controls_shown_ratio_ =
- layer_tree_host_src_->top_controls_shown_ratio_ * 3 + 1;
- layer_tree_host_src_->device_scale_factor_ =
- layer_tree_host_src_->device_scale_factor_ * 3 + 1;
- layer_tree_host_src_->painted_device_scale_factor_ =
- layer_tree_host_src_->painted_device_scale_factor_ * 3 + 1;
- layer_tree_host_src_->page_scale_factor_ =
- layer_tree_host_src_->page_scale_factor_ * 3 + 1;
- layer_tree_host_src_->min_page_scale_factor_ =
- layer_tree_host_src_->min_page_scale_factor_ * 3 + 1;
- layer_tree_host_src_->max_page_scale_factor_ =
- layer_tree_host_src_->max_page_scale_factor_ * 3 + 1;
+ layer_tree_src->inputs_.device_viewport_size = gfx::Size(3, 14);
+ layer_tree_src->inputs_.top_controls_shrink_blink_size =
+ !layer_tree_src->inputs_.top_controls_shrink_blink_size;
+ layer_tree_src->inputs_.top_controls_height =
+ layer_tree_src->inputs_.top_controls_height * 3 + 1;
+ layer_tree_src->inputs_.top_controls_shown_ratio =
+ layer_tree_src->inputs_.top_controls_shown_ratio * 3 + 1;
+ layer_tree_src->inputs_.device_scale_factor =
+ layer_tree_src->inputs_.device_scale_factor * 3 + 1;
+ layer_tree_src->inputs_.painted_device_scale_factor =
+ layer_tree_src->inputs_.painted_device_scale_factor * 3 + 1;
+ layer_tree_src->inputs_.page_scale_factor =
+ layer_tree_src->inputs_.page_scale_factor * 3 + 1;
+ layer_tree_src->inputs_.min_page_scale_factor =
+ layer_tree_src->inputs_.min_page_scale_factor * 3 + 1;
+ layer_tree_src->inputs_.max_page_scale_factor =
+ layer_tree_src->inputs_.max_page_scale_factor * 3 + 1;
layer_tree_host_src_->elastic_overscroll_ = gfx::Vector2dF(3, 14);
layer_tree_host_src_->has_gpu_rasterization_trigger_ =
!layer_tree_host_src_->has_gpu_rasterization_trigger_;
layer_tree_host_src_->content_is_suitable_for_gpu_rasterization_ =
!layer_tree_host_src_->content_is_suitable_for_gpu_rasterization_;
- layer_tree_host_src_->background_color_ = SK_ColorMAGENTA;
- layer_tree_host_src_->has_transparent_background_ =
- !layer_tree_host_src_->has_transparent_background_;
+ layer_tree_src->inputs_.background_color = SK_ColorMAGENTA;
+ layer_tree_src->inputs_.has_transparent_background =
+ !layer_tree_src->inputs_.has_transparent_background;
layer_tree_host_src_->id_ = layer_tree_host_src_->id_ * 3 + 1;
layer_tree_host_src_->next_commit_forces_redraw_ =
!layer_tree_host_src_->next_commit_forces_redraw_;
- layer_tree_host_src_->hud_layer_ = HeadsUpDisplayLayer::Create();
- root_layer_src->AddChild(layer_tree_host_src_->hud_layer_);
- layer_tree_host_src_->overscroll_elasticity_layer_ = Layer::Create();
- root_layer_src->AddChild(
- layer_tree_host_src_->overscroll_elasticity_layer_);
- layer_tree_host_src_->page_scale_layer_ = Layer::Create();
- root_layer_src->AddChild(layer_tree_host_src_->page_scale_layer_);
- layer_tree_host_src_->inner_viewport_scroll_layer_ = Layer::Create();
- root_layer_src->AddChild(
- layer_tree_host_src_->inner_viewport_scroll_layer_);
- layer_tree_host_src_->outer_viewport_scroll_layer_ = Layer::Create();
- root_layer_src->AddChild(
- layer_tree_host_src_->outer_viewport_scroll_layer_);
+ layer_tree_src->hud_layer_ = HeadsUpDisplayLayer::Create();
+ root_layer_src->AddChild(layer_tree_src->hud_layer_);
+
+ scoped_refptr<Layer> overscroll_elasticity_layer = Layer::Create();
+ scoped_refptr<Layer> page_scale_layer = Layer::Create();
+ scoped_refptr<Layer> inner_viewport_scroll_layer = Layer::Create();
+ scoped_refptr<Layer> outer_viewport_scroll_layer = Layer::Create();
+
+ root_layer_src->AddChild(overscroll_elasticity_layer);
+ root_layer_src->AddChild(page_scale_layer);
+ root_layer_src->AddChild(inner_viewport_scroll_layer);
+ root_layer_src->AddChild(outer_viewport_scroll_layer);
+
+ layer_tree_src->RegisterViewportLayers(
+ overscroll_elasticity_layer, page_scale_layer,
+ inner_viewport_scroll_layer, outer_viewport_scroll_layer);
// Set in_paint_layer_contents_ only after all calls to AddChild() have
// finished to ensure it's allowed to do so at that time.
- LayerTree* layer_tree_src = layer_tree_host_src_->GetLayerTree();
layer_tree_src->in_paint_layer_contents_ =
!layer_tree_src->in_paint_layer_contents();
@@ -292,10 +296,10 @@ class LayerTreeHostSerializationTest : public testing::Test {
sel_bound.edge_top = gfx::Point(14, 3);
LayerSelection selection;
selection.start = sel_bound;
- layer_tree_host_src_->selection_ = selection;
+ layer_tree_src->inputs_.selection = selection;
- layer_tree_host_src_->property_trees_.sequence_number =
- layer_tree_host_src_->property_trees_.sequence_number * 3 + 1;
+ layer_tree_src->property_trees_.sequence_number =
+ layer_tree_src->property_trees_.sequence_number * 3 + 1;
layer_tree_host_src_->surface_client_id_ =
layer_tree_host_src_->surface_client_id_ * 3 + 1;
@@ -314,9 +318,10 @@ class LayerTreeHostSerializationTest : public testing::Test {
// No HUD layer or |overscroll_elasticity_layer_|, or the inner/outer
// viewport scroll layers.
- layer_tree_host_src_->overscroll_elasticity_layer_ = Layer::Create();
- root_layer_src->AddChild(
- layer_tree_host_src_->overscroll_elasticity_layer_);
+ scoped_refptr<Layer> overscroll_elasticity_layer = Layer::Create();
+ layer_tree_host_src_->GetLayerTree()->inputs_.overscroll_elasticity_layer =
+ overscroll_elasticity_layer;
+ root_layer_src->AddChild(overscroll_elasticity_layer);
VerifySerializationAndDeserialization();
}
@@ -328,34 +333,41 @@ class LayerTreeHostSerializationTest : public testing::Test {
layer_tree_host_dst_->SetRootLayer(Layer::Create());
root_layer_src->SetDoubleSided(!root_layer_src->double_sided());
+ LayerTree* layer_tree_src = layer_tree_host_src_->GetLayerTree();
+
// Ensure that all the layers work correctly for multiple rounds of
// serialization and deserialization.
- layer_tree_host_src_->hud_layer_ = HeadsUpDisplayLayer::Create();
- root_layer_src->AddChild(layer_tree_host_src_->hud_layer_);
- layer_tree_host_src_->overscroll_elasticity_layer_ = Layer::Create();
- root_layer_src->AddChild(
- layer_tree_host_src_->overscroll_elasticity_layer_);
- layer_tree_host_src_->page_scale_layer_ = Layer::Create();
- root_layer_src->AddChild(layer_tree_host_src_->page_scale_layer_);
- layer_tree_host_src_->inner_viewport_scroll_layer_ = Layer::Create();
- root_layer_src->AddChild(
- layer_tree_host_src_->inner_viewport_scroll_layer_);
- layer_tree_host_src_->outer_viewport_scroll_layer_ = Layer::Create();
- root_layer_src->AddChild(
- layer_tree_host_src_->outer_viewport_scroll_layer_);
+ layer_tree_src->hud_layer_ = HeadsUpDisplayLayer::Create();
+ root_layer_src->AddChild(layer_tree_src->hud_layer_);
+
+ scoped_refptr<Layer> overscroll_elasticity_layer = Layer::Create();
+ scoped_refptr<Layer> page_scale_layer = Layer::Create();
+ scoped_refptr<Layer> inner_viewport_scroll_layer = Layer::Create();
+ scoped_refptr<Layer> outer_viewport_scroll_layer = Layer::Create();
+
+ root_layer_src->AddChild(overscroll_elasticity_layer);
+ root_layer_src->AddChild(page_scale_layer);
+ root_layer_src->AddChild(inner_viewport_scroll_layer);
+ root_layer_src->AddChild(outer_viewport_scroll_layer);
+ layer_tree_host_src_->GetLayerTree()->RegisterViewportLayers(
+ overscroll_elasticity_layer, page_scale_layer,
+ inner_viewport_scroll_layer, outer_viewport_scroll_layer);
VerifySerializationAndDeserialization();
VerifySerializationAndDeserialization();
- layer_tree_host_src_->hud_layer_ = nullptr;
+ layer_tree_src->hud_layer_ = nullptr;
VerifySerializationAndDeserialization();
- layer_tree_host_src_->overscroll_elasticity_layer_ = nullptr;
+ layer_tree_host_src_->GetLayerTree()->inputs_.overscroll_elasticity_layer =
+ nullptr;
VerifySerializationAndDeserialization();
- layer_tree_host_src_->page_scale_layer_ = nullptr;
+ layer_tree_host_src_->GetLayerTree()->inputs_.page_scale_layer = nullptr;
VerifySerializationAndDeserialization();
- layer_tree_host_src_->inner_viewport_scroll_layer_ = nullptr;
+ layer_tree_host_src_->GetLayerTree()->inputs_.inner_viewport_scroll_layer =
+ nullptr;
VerifySerializationAndDeserialization();
- layer_tree_host_src_->outer_viewport_scroll_layer_ = nullptr;
+ layer_tree_host_src_->GetLayerTree()->inputs_.outer_viewport_scroll_layer =
+ nullptr;
VerifySerializationAndDeserialization();
}
« cc/test/fake_layer_tree_host.cc ('K') | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | cc/trees/layer_tree_host_unittest_video.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698