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

Unified Diff: cc/test/layer_test_common.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 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
« no previous file with comments | « cc/test/layer_test_common.h ('k') | cc/test/layer_tree_host_common_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_test_common.cc
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index 0ef1f02ad21025c0a8e384d27b535a9eddf3daba..23b4144d28df83219403c93e9c34eea999832451 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -125,7 +125,7 @@ LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings)
host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_, settings)),
render_pass_(RenderPass::Create()),
layer_impl_id_(2) {
- scoped_ptr<LayerImpl> root =
+ std::unique_ptr<LayerImpl> root =
LayerImpl::Create(host_->host_impl()->active_tree(), 1);
host_->host_impl()->active_tree()->SetRootLayer(std::move(root));
root_layer()->SetHasRenderSurface(true);
@@ -207,10 +207,10 @@ void LayerTestCommon::LayerImplTest::AppendSurfaceQuadsWithOcclusion(
SK_ColorBLACK, 1.f, nullptr, &data, RenderPassId(1, 1));
}
-void EmptyCopyOutputCallback(scoped_ptr<CopyOutputResult> result) {}
+void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {}
void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() {
- std::vector<scoped_ptr<CopyOutputRequest>> copy_requests;
+ std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests;
copy_requests.push_back(
CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback)));
root_layer()->PassCopyRequests(&copy_requests);
« no previous file with comments | « cc/test/layer_test_common.h ('k') | cc/test/layer_tree_host_common_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698