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

Side by Side Diff: cc/test/render_pass_test_utils.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 unified diff | Download patch
« no previous file with comments | « cc/test/remote_proto_channel_bridge.cc ('k') | cc/test/scheduler_test_common.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/test/render_pass_test_utils.h" 5 #include "cc/test/render_pass_test_utils.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "cc/quads/debug_border_draw_quad.h" 10 #include "cc/quads/debug_border_draw_quad.h"
11 #include "cc/quads/io_surface_draw_quad.h" 11 #include "cc/quads/io_surface_draw_quad.h"
12 #include "cc/quads/render_pass_draw_quad.h" 12 #include "cc/quads/render_pass_draw_quad.h"
13 #include "cc/quads/shared_quad_state.h" 13 #include "cc/quads/shared_quad_state.h"
14 #include "cc/quads/solid_color_draw_quad.h" 14 #include "cc/quads/solid_color_draw_quad.h"
15 #include "cc/quads/stream_video_draw_quad.h" 15 #include "cc/quads/stream_video_draw_quad.h"
16 #include "cc/quads/texture_draw_quad.h" 16 #include "cc/quads/texture_draw_quad.h"
17 #include "cc/quads/tile_draw_quad.h" 17 #include "cc/quads/tile_draw_quad.h"
18 #include "cc/quads/yuv_video_draw_quad.h" 18 #include "cc/quads/yuv_video_draw_quad.h"
19 #include "cc/resources/resource_provider.h" 19 #include "cc/resources/resource_provider.h"
20 #include "third_party/skia/include/core/SkColor.h" 20 #include "third_party/skia/include/core/SkColor.h"
21 #include "third_party/skia/include/core/SkImageFilter.h" 21 #include "third_party/skia/include/core/SkImageFilter.h"
22 #include "ui/gfx/geometry/rect.h" 22 #include "ui/gfx/geometry/rect.h"
23 23
24 namespace cc { 24 namespace cc {
25 25
26 RenderPass* AddRenderPass(RenderPassList* pass_list, 26 RenderPass* AddRenderPass(RenderPassList* pass_list,
27 RenderPassId id, 27 RenderPassId id,
28 const gfx::Rect& output_rect, 28 const gfx::Rect& output_rect,
29 const gfx::Transform& root_transform) { 29 const gfx::Transform& root_transform) {
30 scoped_ptr<RenderPass> pass(RenderPass::Create()); 30 std::unique_ptr<RenderPass> pass(RenderPass::Create());
31 pass->SetNew(id, output_rect, output_rect, root_transform); 31 pass->SetNew(id, output_rect, output_rect, root_transform);
32 RenderPass* saved = pass.get(); 32 RenderPass* saved = pass.get();
33 pass_list->push_back(std::move(pass)); 33 pass_list->push_back(std::move(pass));
34 return saved; 34 return saved;
35 } 35 }
36 36
37 SolidColorDrawQuad* AddQuad(RenderPass* pass, 37 SolidColorDrawQuad* AddQuad(RenderPass* pass,
38 const gfx::Rect& rect, 38 const gfx::Rect& rect,
39 SkColor color) { 39 SkColor color) {
40 SharedQuadState* shared_state = pass->CreateAndAppendSharedQuadState(); 40 SharedQuadState* shared_state = pass->CreateAndAppendSharedQuadState();
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 resource_provider->best_texture_format()); 189 resource_provider->best_texture_format());
190 resource_provider->AllocateForTesting(resource6); 190 resource_provider->AllocateForTesting(resource6);
191 ResourceId resource7 = resource_provider->CreateResource( 191 ResourceId resource7 = resource_provider->CreateResource(
192 gfx::Size(9, 14), ResourceProvider::TEXTURE_HINT_IMMUTABLE, 192 gfx::Size(9, 14), ResourceProvider::TEXTURE_HINT_IMMUTABLE,
193 resource_provider->best_texture_format()); 193 resource_provider->best_texture_format());
194 resource_provider->AllocateForTesting(resource7); 194 resource_provider->AllocateForTesting(resource7);
195 195
196 unsigned target = GL_TEXTURE_2D; 196 unsigned target = GL_TEXTURE_2D;
197 gpu::Mailbox gpu_mailbox; 197 gpu::Mailbox gpu_mailbox;
198 memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1); 198 memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1);
199 scoped_ptr<SingleReleaseCallbackImpl> callback = 199 std::unique_ptr<SingleReleaseCallbackImpl> callback =
200 SingleReleaseCallbackImpl::Create(base::Bind(&EmptyReleaseCallback)); 200 SingleReleaseCallbackImpl::Create(base::Bind(&EmptyReleaseCallback));
201 TextureMailbox mailbox(gpu_mailbox, kSyncTokenForMailboxTextureQuad, target); 201 TextureMailbox mailbox(gpu_mailbox, kSyncTokenForMailboxTextureQuad, target);
202 ResourceId resource8 = resource_provider->CreateResourceFromTextureMailbox( 202 ResourceId resource8 = resource_provider->CreateResourceFromTextureMailbox(
203 mailbox, std::move(callback)); 203 mailbox, std::move(callback));
204 resource_provider->AllocateForTesting(resource8); 204 resource_provider->AllocateForTesting(resource8);
205 205
206 SharedQuadState* shared_state = to_pass->CreateAndAppendSharedQuadState(); 206 SharedQuadState* shared_state = to_pass->CreateAndAppendSharedQuadState();
207 shared_state->SetAll(gfx::Transform(), rect.size(), rect, rect, false, 1, 207 shared_state->SetAll(gfx::Transform(), rect.size(), rect, rect, false, 1,
208 SkXfermode::kSrcOver_Mode, 0); 208 SkXfermode::kSrcOver_Mode, 0);
209 209
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 to_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>(); 296 to_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>();
297 yuv_quad->SetNew(shared_state2, rect, opaque_rect, visible_rect, 297 yuv_quad->SetNew(shared_state2, rect, opaque_rect, visible_rect,
298 gfx::RectF(.0f, .0f, 100.0f, 100.0f), 298 gfx::RectF(.0f, .0f, 100.0f, 100.0f),
299 gfx::RectF(.0f, .0f, 50.0f, 50.0f), gfx::Size(100, 100), 299 gfx::RectF(.0f, .0f, 50.0f, 50.0f), gfx::Size(100, 100),
300 gfx::Size(50, 50), plane_resources[0], plane_resources[1], 300 gfx::Size(50, 50), plane_resources[0], plane_resources[1],
301 plane_resources[2], plane_resources[3], color_space, 0.0, 301 plane_resources[2], plane_resources[3], color_space, 0.0,
302 1.0); 302 1.0);
303 } 303 }
304 304
305 } // namespace cc 305 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/remote_proto_channel_bridge.cc ('k') | cc/test/scheduler_test_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698