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

Side by Side Diff: cc/test/pixel_test.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/pixel_test.h ('k') | cc/test/pixel_test_output_surface.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/pixel_test.h" 5 #include "cc/test/pixel_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/ptr_util.h"
8 #include "base/path_service.h" 9 #include "base/path_service.h"
9 #include "base/run_loop.h" 10 #include "base/run_loop.h"
10 #include "base/thread_task_runner_handle.h" 11 #include "base/thread_task_runner_handle.h"
11 #include "cc/base/switches.h" 12 #include "cc/base/switches.h"
12 #include "cc/output/compositor_frame_metadata.h" 13 #include "cc/output/compositor_frame_metadata.h"
13 #include "cc/output/copy_output_request.h" 14 #include "cc/output/copy_output_request.h"
14 #include "cc/output/copy_output_result.h" 15 #include "cc/output/copy_output_result.h"
15 #include "cc/output/gl_renderer.h" 16 #include "cc/output/gl_renderer.h"
16 #include "cc/output/output_surface_client.h" 17 #include "cc/output/output_surface_client.h"
17 #include "cc/output/software_renderer.h" 18 #include "cc/output/software_renderer.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 } 59 }
59 60
60 bool PixelTest::RunPixelTestWithReadbackTargetAndArea( 61 bool PixelTest::RunPixelTestWithReadbackTargetAndArea(
61 RenderPassList* pass_list, 62 RenderPassList* pass_list,
62 RenderPass* target, 63 RenderPass* target,
63 const base::FilePath& ref_file, 64 const base::FilePath& ref_file,
64 const PixelComparator& comparator, 65 const PixelComparator& comparator,
65 const gfx::Rect* copy_rect) { 66 const gfx::Rect* copy_rect) {
66 base::RunLoop run_loop; 67 base::RunLoop run_loop;
67 68
68 scoped_ptr<CopyOutputRequest> request = 69 std::unique_ptr<CopyOutputRequest> request =
69 CopyOutputRequest::CreateBitmapRequest( 70 CopyOutputRequest::CreateBitmapRequest(
70 base::Bind(&PixelTest::ReadbackResult, 71 base::Bind(&PixelTest::ReadbackResult, base::Unretained(this),
71 base::Unretained(this),
72 run_loop.QuitClosure())); 72 run_loop.QuitClosure()));
73 if (copy_rect) 73 if (copy_rect)
74 request->set_area(*copy_rect); 74 request->set_area(*copy_rect);
75 target->copy_requests.push_back(std::move(request)); 75 target->copy_requests.push_back(std::move(request));
76 76
77 float device_scale_factor = 1.f; 77 float device_scale_factor = 1.f;
78 gfx::Rect device_viewport_rect = 78 gfx::Rect device_viewport_rect =
79 gfx::Rect(device_viewport_size_) + external_device_viewport_offset_; 79 gfx::Rect(device_viewport_size_) + external_device_viewport_offset_;
80 gfx::Rect device_clip_rect = external_device_clip_rect_.IsEmpty() 80 gfx::Rect device_clip_rect = external_device_clip_rect_.IsEmpty()
81 ? device_viewport_rect 81 ? device_viewport_rect
82 : external_device_clip_rect_; 82 : external_device_clip_rect_;
83 renderer_->DecideRenderPassAllocationsForFrame(*pass_list); 83 renderer_->DecideRenderPassAllocationsForFrame(*pass_list);
84 renderer_->DrawFrame(pass_list, 84 renderer_->DrawFrame(pass_list,
85 device_scale_factor, 85 device_scale_factor,
86 device_viewport_rect, 86 device_viewport_rect,
87 device_clip_rect, 87 device_clip_rect,
88 disable_picture_quad_image_filtering_); 88 disable_picture_quad_image_filtering_);
89 89
90 // Wait for the readback to complete. 90 // Wait for the readback to complete.
91 if (output_surface_->context_provider()) 91 if (output_surface_->context_provider())
92 output_surface_->context_provider()->ContextGL()->Finish(); 92 output_surface_->context_provider()->ContextGL()->Finish();
93 run_loop.Run(); 93 run_loop.Run();
94 94
95 return PixelsMatchReference(ref_file, comparator); 95 return PixelsMatchReference(ref_file, comparator);
96 } 96 }
97 97
98 void PixelTest::ReadbackResult(base::Closure quit_run_loop, 98 void PixelTest::ReadbackResult(base::Closure quit_run_loop,
99 scoped_ptr<CopyOutputResult> result) { 99 std::unique_ptr<CopyOutputResult> result) {
100 ASSERT_TRUE(result->HasBitmap()); 100 ASSERT_TRUE(result->HasBitmap());
101 result_bitmap_ = result->TakeBitmap(); 101 result_bitmap_ = result->TakeBitmap();
102 quit_run_loop.Run(); 102 quit_run_loop.Run();
103 } 103 }
104 104
105 bool PixelTest::PixelsMatchReference(const base::FilePath& ref_file, 105 bool PixelTest::PixelsMatchReference(const base::FilePath& ref_file,
106 const PixelComparator& comparator) { 106 const PixelComparator& comparator) {
107 base::FilePath test_data_dir; 107 base::FilePath test_data_dir;
108 if (!PathService::Get(CCPaths::DIR_TEST_DATA, &test_data_dir)) 108 if (!PathService::Get(CCPaths::DIR_TEST_DATA, &test_data_dir))
109 return false; 109 return false;
(...skipping 23 matching lines...) Expand all
133 output_surface_->BindToClient(output_surface_client_.get()); 133 output_surface_->BindToClient(output_surface_client_.get());
134 134
135 shared_bitmap_manager_.reset(new TestSharedBitmapManager); 135 shared_bitmap_manager_.reset(new TestSharedBitmapManager);
136 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); 136 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager);
137 resource_provider_ = ResourceProvider::Create( 137 resource_provider_ = ResourceProvider::Create(
138 output_surface_.get(), shared_bitmap_manager_.get(), 138 output_surface_.get(), shared_bitmap_manager_.get(),
139 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, 139 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1,
140 settings_.renderer_settings.use_gpu_memory_buffer_resources, 140 settings_.renderer_settings.use_gpu_memory_buffer_resources,
141 settings_.use_image_texture_targets); 141 settings_.use_image_texture_targets);
142 142
143 texture_mailbox_deleter_ = make_scoped_ptr( 143 texture_mailbox_deleter_ = base::WrapUnique(
144 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())); 144 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get()));
145 145
146 renderer_ = GLRenderer::Create( 146 renderer_ = GLRenderer::Create(
147 this, &settings_.renderer_settings, output_surface_.get(), 147 this, &settings_.renderer_settings, output_surface_.get(),
148 resource_provider_.get(), texture_mailbox_deleter_.get(), 0); 148 resource_provider_.get(), texture_mailbox_deleter_.get(), 0);
149 } 149 }
150 150
151 void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) { 151 void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) {
152 static_cast<PixelTestOutputSurface*>(output_surface_.get()) 152 static_cast<PixelTestOutputSurface*>(output_surface_.get())
153 ->set_surface_expansion_size(surface_expansion); 153 ->set_surface_expansion_size(surface_expansion);
(...skipping 11 matching lines...) Expand all
165 void PixelTest::ForceDeviceClip(const gfx::Rect& clip) { 165 void PixelTest::ForceDeviceClip(const gfx::Rect& clip) {
166 external_device_clip_rect_ = clip; 166 external_device_clip_rect_ = clip;
167 } 167 }
168 168
169 void PixelTest::EnableExternalStencilTest() { 169 void PixelTest::EnableExternalStencilTest() {
170 static_cast<PixelTestOutputSurface*>(output_surface_.get()) 170 static_cast<PixelTestOutputSurface*>(output_surface_.get())
171 ->set_has_external_stencil_test(true); 171 ->set_has_external_stencil_test(true);
172 } 172 }
173 173
174 void PixelTest::SetUpSoftwareRenderer() { 174 void PixelTest::SetUpSoftwareRenderer() {
175 scoped_ptr<SoftwareOutputDevice> device(new PixelTestSoftwareOutputDevice()); 175 std::unique_ptr<SoftwareOutputDevice> device(
176 new PixelTestSoftwareOutputDevice());
176 output_surface_.reset(new PixelTestOutputSurface(std::move(device))); 177 output_surface_.reset(new PixelTestOutputSurface(std::move(device)));
177 output_surface_->BindToClient(output_surface_client_.get()); 178 output_surface_->BindToClient(output_surface_client_.get());
178 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 179 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
179 resource_provider_ = ResourceProvider::Create( 180 resource_provider_ = ResourceProvider::Create(
180 output_surface_.get(), shared_bitmap_manager_.get(), 181 output_surface_.get(), shared_bitmap_manager_.get(),
181 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, 182 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1,
182 settings_.renderer_settings.use_gpu_memory_buffer_resources, 183 settings_.renderer_settings.use_gpu_memory_buffer_resources,
183 settings_.use_image_texture_targets); 184 settings_.use_image_texture_targets);
184 renderer_ = 185 renderer_ =
185 SoftwareRenderer::Create(this, &settings_.renderer_settings, 186 SoftwareRenderer::Create(this, &settings_.renderer_settings,
186 output_surface_.get(), resource_provider_.get()); 187 output_surface_.get(), resource_provider_.get());
187 } 188 }
188 189
189 } // namespace cc 190 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/pixel_test.h ('k') | cc/test/pixel_test_output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698