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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 1801853002: Transfer LayerImpl ownership to LayerTreeImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaaase. Created 4 years, 9 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
Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 25548dab2c14243b5101edfac55aa327c49e05c3..eef990e64129e0e31cf9497cb807dfee1700ce3d 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -1740,7 +1740,7 @@ class LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers
FakePictureLayerImpl* root =
static_cast<FakePictureLayerImpl*>(impl->active_tree()->root_layer());
FakePictureLayerImpl* child = static_cast<FakePictureLayerImpl*>(
- impl->active_tree()->root_layer()->children()[0].get());
+ impl->active_tree()->root_layer()->children()[0]);
// Positions remain in layout pixels.
EXPECT_EQ(gfx::PointF(), root->position());
@@ -3125,21 +3125,21 @@ class LayerTreeHostTestImplLayersPushProperties
if (root_impl_ && root_impl_->children().size() > 0) {
child_impl_ = static_cast<PushPropertiesCountingLayerImpl*>(
- root_impl_->children()[0].get());
+ root_impl_->children()[0]);
if (child_impl_ && child_impl_->children().size() > 0)
grandchild_impl_ = static_cast<PushPropertiesCountingLayerImpl*>(
- child_impl_->children()[0].get());
+ child_impl_->children()[0]);
}
if (root_impl_ && root_impl_->children().size() > 1) {
child2_impl_ = static_cast<PushPropertiesCountingLayerImpl*>(
- root_impl_->children()[1].get());
+ root_impl_->children()[1]);
if (child2_impl_ && child2_impl_->children().size() > 0)
leaf_always_pushing_layer_impl_ =
static_cast<PushPropertiesCountingLayerImpl*>(
- child2_impl_->children()[0].get());
+ child2_impl_->children()[0]);
}
if (root_impl_)
@@ -3876,8 +3876,8 @@ class LayerTreeHostTestPushHiddenLayer : public LayerTreeHostTest {
void DidActivateTreeOnThread(LayerTreeHostImpl* impl) override {
LayerImpl* root = impl->active_tree()->root_layer();
- LayerImpl* parent = root->children()[0].get();
- LayerImpl* child = parent->children()[0].get();
+ LayerImpl* parent = root->children()[0];
+ LayerImpl* child = parent->children()[0];
switch (impl->active_tree()->source_frame_number()) {
case 1:
@@ -3977,10 +3977,8 @@ class LayerTreeHostTestElasticOverscroll : public LayerTreeHostTest {
void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
num_draws_++;
- LayerImpl* content_layer_impl = host_impl->active_tree()
- ->InnerViewportScrollLayer()
- ->children()[0]
- .get();
+ LayerImpl* content_layer_impl =
+ host_impl->active_tree()->InnerViewportScrollLayer()->children()[0];
gfx::Transform expected_draw_transform;
switch (num_draws_) {
case 1:

Powered by Google App Engine
This is Rietveld 408576698