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

Unified Diff: cc/layers/delegated_renderer_layer_impl_unittest.cc

Issue 1455023002: cc: Replace Pass() with std::move() in some subdirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pass-cc
Patch Set: pass-cc2: . Created 5 years, 1 month 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/layers/delegated_renderer_layer_impl.cc ('k') | cc/layers/delegated_renderer_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/delegated_renderer_layer_impl_unittest.cc
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index e14d2a481e377cbce6111ace5707420e8610b607..2a93a8b70dd52ba78b677609e2f773847b35c170 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -118,13 +118,13 @@ class DelegatedRendererLayerImplTestSimple
// Force the delegated RenderPasses to come before the RenderPass from
// layer_after.
- layer_after->AddChild(delegated_renderer_layer.Pass());
- root_layer->AddChild(layer_after.Pass());
+ layer_after->AddChild(std::move(delegated_renderer_layer));
+ root_layer->AddChild(std::move(layer_after));
// Get the RenderPass generated by layer_before to come before the delegated
// RenderPasses.
- root_layer->AddChild(layer_before.Pass());
- host_impl_->active_tree()->SetRootLayer(root_layer.Pass());
+ root_layer->AddChild(std::move(layer_before));
+ host_impl_->active_tree()->SetRootLayer(std::move(root_layer));
}
protected:
@@ -174,9 +174,9 @@ TEST_F(DelegatedRendererLayerImplTest,
fake_delegated_renderer_layer_impl = delegated_renderer_layer.get();
- root_layer->AddChild(delegated_renderer_layer.Pass());
+ root_layer->AddChild(std::move(delegated_renderer_layer));
- host_impl_->active_tree()->SetRootLayer(root_layer.Pass());
+ host_impl_->active_tree()->SetRootLayer(std::move(root_layer));
LayerTreeHostImpl::FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, PrepareToDrawFrame(&frame));
@@ -253,9 +253,9 @@ TEST_F(DelegatedRendererLayerImplTest,
fake_delegated_renderer_layer_impl = delegated_renderer_layer.get();
- root_layer->AddChild(delegated_renderer_layer.Pass());
+ root_layer->AddChild(std::move(delegated_renderer_layer));
- host_impl_->pending_tree()->SetRootLayer(root_layer.Pass());
+ host_impl_->pending_tree()->SetRootLayer(std::move(root_layer));
host_impl_->ActivateSyncTree();
LayerTreeHostImpl::FrameData frame;
@@ -740,8 +740,8 @@ class DelegatedRendererLayerImplTestTransform
root_layer_ = root_layer.get();
delegated_renderer_layer_ = delegated_renderer_layer.get();
- root_layer->AddChild(delegated_renderer_layer.Pass());
- host_impl_->active_tree()->SetRootLayer(root_layer.Pass());
+ root_layer->AddChild(std::move(delegated_renderer_layer));
+ host_impl_->active_tree()->SetRootLayer(std::move(root_layer));
}
void VerifyRenderPasses(
@@ -1169,14 +1169,14 @@ class DelegatedRendererLayerImplTestClip
origin_layer->SetPosition(
gfx::PointF(-clip_origin.x(), -clip_origin.y()));
- origin_layer->AddChild(delegated_renderer_layer.Pass());
- clip_layer->AddChild(origin_layer.Pass());
- root_layer->AddChild(clip_layer.Pass());
+ origin_layer->AddChild(std::move(delegated_renderer_layer));
+ clip_layer->AddChild(std::move(origin_layer));
+ root_layer->AddChild(std::move(clip_layer));
} else {
- root_layer->AddChild(delegated_renderer_layer.Pass());
+ root_layer->AddChild(std::move(delegated_renderer_layer));
}
- host_impl_->active_tree()->SetRootLayer(root_layer.Pass());
+ host_impl_->active_tree()->SetRootLayer(std::move(root_layer));
}
protected:
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.cc ('k') | cc/layers/delegated_renderer_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698