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

Unified Diff: cc/layers/render_surface_unittest.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/layers/render_surface_impl_unittest.cc ('k') | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/render_surface_unittest.cc
diff --git a/cc/layers/render_surface_unittest.cc b/cc/layers/render_surface_unittest.cc
index 2c15bf6d1c96182a51080028623177dd4aca8062..70354606103d37d6df8cbb7b27d8047eb2484da6 100644
--- a/cc/layers/render_surface_unittest.cc
+++ b/cc/layers/render_surface_unittest.cc
@@ -42,7 +42,7 @@ TEST(RenderSurfaceTest, VerifySurfaceChangesAreTrackedProperly) {
TestTaskGraphRunner task_graph_runner;
FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
&task_graph_runner);
- scoped_ptr<LayerImpl> owning_layer =
+ std::unique_ptr<LayerImpl> owning_layer =
LayerImpl::Create(host_impl.active_tree(), 1);
owning_layer->SetHasRenderSurface(true);
ASSERT_TRUE(owning_layer->render_surface());
@@ -68,7 +68,7 @@ TEST(RenderSurfaceTest, VerifySurfaceChangesAreTrackedProperly) {
EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(
render_surface->SetContentRect(test_rect));
- scoped_ptr<LayerImpl> dummy_mask =
+ std::unique_ptr<LayerImpl> dummy_mask =
LayerImpl::Create(host_impl.active_tree(), 2);
gfx::Transform dummy_matrix;
dummy_matrix.Translate(1.0, 2.0);
@@ -91,10 +91,10 @@ TEST(RenderSurfaceTest, SanityCheckSurfaceCreatesCorrectSharedQuadState) {
TestTaskGraphRunner task_graph_runner;
FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
&task_graph_runner);
- scoped_ptr<LayerImpl> root_layer =
+ std::unique_ptr<LayerImpl> root_layer =
LayerImpl::Create(host_impl.active_tree(), 1);
- scoped_ptr<LayerImpl> owning_layer =
+ std::unique_ptr<LayerImpl> owning_layer =
LayerImpl::Create(host_impl.active_tree(), 2);
owning_layer->SetHasRenderSurface(true);
ASSERT_TRUE(owning_layer->render_surface());
@@ -115,7 +115,7 @@ TEST(RenderSurfaceTest, SanityCheckSurfaceCreatesCorrectSharedQuadState) {
render_surface->SetClipRect(clip_rect);
render_surface->SetDrawOpacity(1.f);
- scoped_ptr<RenderPass> render_pass = RenderPass::Create();
+ std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
AppendQuadsData append_quads_data;
render_surface->AppendQuads(render_pass.get(), origin, Occlusion(),
@@ -140,7 +140,7 @@ TEST(RenderSurfaceTest, SanityCheckSurfaceCreatesCorrectSharedQuadState) {
class TestRenderPassSink : public RenderPassSink {
public:
- void AppendRenderPass(scoped_ptr<RenderPass> render_pass) override {
+ void AppendRenderPass(std::unique_ptr<RenderPass> render_pass) override {
render_passes_.push_back(std::move(render_pass));
}
@@ -158,10 +158,10 @@ TEST(RenderSurfaceTest, SanityCheckSurfaceCreatesCorrectRenderPass) {
TestTaskGraphRunner task_graph_runner;
FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
&task_graph_runner);
- scoped_ptr<LayerImpl> root_layer =
+ std::unique_ptr<LayerImpl> root_layer =
LayerImpl::Create(host_impl.active_tree(), 1);
- scoped_ptr<LayerImpl> owning_layer =
+ std::unique_ptr<LayerImpl> owning_layer =
LayerImpl::Create(host_impl.active_tree(), 2);
owning_layer->SetHasRenderSurface(true);
ASSERT_TRUE(owning_layer->render_surface());
« no previous file with comments | « cc/layers/render_surface_impl_unittest.cc ('k') | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698