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

Unified Diff: cc/layers/solid_color_layer_impl_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/solid_color_layer_impl.cc ('k') | cc/layers/solid_color_scrollbar_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/solid_color_layer_impl_unittest.cc
diff --git a/cc/layers/solid_color_layer_impl_unittest.cc b/cc/layers/solid_color_layer_impl_unittest.cc
index 5a9b11d6db5d4a9d96730c719eb2cb9e115da387..75a8e9c87c6e05dc12c8f30bbb329b2ba48fc2d1 100644
--- a/cc/layers/solid_color_layer_impl_unittest.cc
+++ b/cc/layers/solid_color_layer_impl_unittest.cc
@@ -24,7 +24,7 @@ namespace cc {
namespace {
TEST(SolidColorLayerImplTest, VerifyTilingCompleteAndNoOverlap) {
- scoped_ptr<RenderPass> render_pass = RenderPass::Create();
+ std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Size layer_size = gfx::Size(800, 600);
gfx::Rect visible_layer_rect = gfx::Rect(layer_size);
@@ -33,7 +33,7 @@ TEST(SolidColorLayerImplTest, VerifyTilingCompleteAndNoOverlap) {
TestTaskGraphRunner task_graph_runner;
FakeLayerTreeHostImpl host_impl(&task_runner_provider, nullptr,
&task_graph_runner);
- scoped_ptr<SolidColorLayerImpl> layer =
+ std::unique_ptr<SolidColorLayerImpl> layer =
SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
layer->draw_properties().visible_layer_rect = visible_layer_rect;
layer->SetBounds(layer_size);
@@ -50,7 +50,7 @@ TEST(SolidColorLayerImplTest, VerifyTilingCompleteAndNoOverlap) {
TEST(SolidColorLayerImplTest, VerifyCorrectBackgroundColorInQuad) {
SkColor test_color = 0xFFA55AFF;
- scoped_ptr<RenderPass> render_pass = RenderPass::Create();
+ std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Size layer_size = gfx::Size(100, 100);
gfx::Rect visible_layer_rect = gfx::Rect(layer_size);
@@ -59,7 +59,7 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBackgroundColorInQuad) {
TestTaskGraphRunner task_graph_runner;
FakeLayerTreeHostImpl host_impl(&task_runner_provider, nullptr,
&task_graph_runner);
- scoped_ptr<SolidColorLayerImpl> layer =
+ std::unique_ptr<SolidColorLayerImpl> layer =
SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
layer->draw_properties().visible_layer_rect = visible_layer_rect;
layer->SetBounds(layer_size);
@@ -79,7 +79,7 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBackgroundColorInQuad) {
TEST(SolidColorLayerImplTest, VerifyCorrectOpacityInQuad) {
const float opacity = 0.5f;
- scoped_ptr<RenderPass> render_pass = RenderPass::Create();
+ std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Size layer_size = gfx::Size(100, 100);
gfx::Rect visible_layer_rect = gfx::Rect(layer_size);
@@ -88,7 +88,7 @@ TEST(SolidColorLayerImplTest, VerifyCorrectOpacityInQuad) {
TestTaskGraphRunner task_graph_runner;
FakeLayerTreeHostImpl host_impl(&task_runner_provider, nullptr,
&task_graph_runner);
- scoped_ptr<SolidColorLayerImpl> layer =
+ std::unique_ptr<SolidColorLayerImpl> layer =
SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
layer->draw_properties().visible_layer_rect = visible_layer_rect;
layer->SetBounds(layer_size);
@@ -108,7 +108,7 @@ TEST(SolidColorLayerImplTest, VerifyCorrectOpacityInQuad) {
TEST(SolidColorLayerImplTest, VerifyCorrectBlendModeInQuad) {
const SkXfermode::Mode blend_mode = SkXfermode::kMultiply_Mode;
- scoped_ptr<RenderPass> render_pass = RenderPass::Create();
+ std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Size layer_size = gfx::Size(100, 100);
gfx::Rect visible_layer_rect = gfx::Rect(layer_size);
@@ -117,7 +117,7 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBlendModeInQuad) {
TestTaskGraphRunner task_graph_runner;
FakeLayerTreeHostImpl host_impl(&task_runner_provider, nullptr,
&task_graph_runner);
- scoped_ptr<SolidColorLayerImpl> layer =
+ std::unique_ptr<SolidColorLayerImpl> layer =
SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
layer->SetBounds(layer_size);
layer->set_draw_blend_mode(blend_mode);
@@ -143,7 +143,7 @@ TEST(SolidColorLayerImplTest, VerifyOpaqueRect) {
FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);
TestTaskGraphRunner task_graph_runner;
- scoped_ptr<FakeLayerTreeHost> host =
+ std::unique_ptr<FakeLayerTreeHost> host =
FakeLayerTreeHost::Create(&client, &task_graph_runner);
host->SetRootLayer(root);
@@ -155,7 +155,7 @@ TEST(SolidColorLayerImplTest, VerifyOpaqueRect) {
layer->SetBackgroundColor(SkColorSetARGBInline(255, 10, 20, 30));
EXPECT_TRUE(layer->contents_opaque());
{
- scoped_ptr<SolidColorLayerImpl> layer_impl =
+ std::unique_ptr<SolidColorLayerImpl> layer_impl =
SolidColorLayerImpl::Create(host->host_impl()->active_tree(),
layer->id());
layer->PushPropertiesTo(layer_impl.get());
@@ -167,7 +167,7 @@ TEST(SolidColorLayerImplTest, VerifyOpaqueRect) {
// should be the full tile.
layer_impl->draw_properties().opacity = 1;
- scoped_ptr<RenderPass> render_pass = RenderPass::Create();
+ std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
AppendQuadsData data;
layer_impl->AppendQuads(render_pass.get(), &data);
@@ -181,7 +181,7 @@ TEST(SolidColorLayerImplTest, VerifyOpaqueRect) {
layer->SetBackgroundColor(SkColorSetARGBInline(254, 10, 20, 30));
EXPECT_FALSE(layer->contents_opaque());
{
- scoped_ptr<SolidColorLayerImpl> layer_impl =
+ std::unique_ptr<SolidColorLayerImpl> layer_impl =
SolidColorLayerImpl::Create(host->host_impl()->active_tree(),
layer->id());
layer->PushPropertiesTo(layer_impl.get());
@@ -193,7 +193,7 @@ TEST(SolidColorLayerImplTest, VerifyOpaqueRect) {
// should be empty.
layer_impl->draw_properties().opacity = 1;
- scoped_ptr<RenderPass> render_pass = RenderPass::Create();
+ std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
AppendQuadsData data;
layer_impl->AppendQuads(render_pass.get(), &data);
« no previous file with comments | « cc/layers/solid_color_layer_impl.cc ('k') | cc/layers/solid_color_scrollbar_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698