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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_host_unittest_serialization.cc

Issue 2183403002: cc: Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@layer_tree_change
Patch Set: .. Created 4 years, 5 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/trees/layer_tree_host.h ('K') | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | cc/trees/property_tree_builder.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 5172c3e61b67e8840016334fa7a719c7bb8b67a2..c24eed6e13f9d1cd630f587e16515b3354ac7b91 100644
--- a/cc/trees/layer_tree_host_unittest_serialization.cc
+++ b/cc/trees/layer_tree_host_unittest_serialization.cc
@@ -181,29 +181,29 @@ class LayerTreeHostSerializationTest : public testing::Test {
} else {
EXPECT_FALSE(layer_tree_host_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_);
@@ -270,17 +270,20 @@ class LayerTreeHostSerializationTest : public testing::Test {
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_);
+
+ 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);
// Set in_paint_layer_contents_ only after all calls to AddChild() have
// finished to ensure it's allowed to do so at that time.
@@ -314,9 +317,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();
}
@@ -332,30 +336,35 @@ class LayerTreeHostSerializationTest : public testing::Test {
// 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_);
+
+ 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;
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/trees/layer_tree_host.h ('K') | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | cc/trees/property_tree_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698