OLD | NEW |
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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "base/test/test_simple_task_runner.h" | 10 #include "base/test/test_simple_task_runner.h" |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 image_decode_tasks->push_back(new PerfImageDecodeTaskImpl); | 235 image_decode_tasks->push_back(new PerfImageDecodeTaskImpl); |
236 } | 236 } |
237 | 237 |
238 void CreateRasterTasks(PerfRasterBufferProviderHelper* helper, | 238 void CreateRasterTasks(PerfRasterBufferProviderHelper* helper, |
239 unsigned num_raster_tasks, | 239 unsigned num_raster_tasks, |
240 const TileTask::Vector& image_decode_tasks, | 240 const TileTask::Vector& image_decode_tasks, |
241 RasterTaskVector* raster_tasks) { | 241 RasterTaskVector* raster_tasks) { |
242 const gfx::Size size(1, 1); | 242 const gfx::Size size(1, 1); |
243 | 243 |
244 for (unsigned i = 0; i < num_raster_tasks; ++i) { | 244 for (unsigned i = 0; i < num_raster_tasks; ++i) { |
245 std::unique_ptr<ScopedResource> resource( | 245 auto resource = |
246 ScopedResource::Create(resource_provider_.get())); | 246 base::MakeUnique<ScopedResource>(resource_provider_.get()); |
247 resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, | 247 resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, |
248 RGBA_8888, gfx::ColorSpace()); | 248 RGBA_8888, gfx::ColorSpace()); |
249 | 249 |
250 // No tile ids are given to support partial updates. | 250 // No tile ids are given to support partial updates. |
251 std::unique_ptr<RasterBuffer> raster_buffer; | 251 std::unique_ptr<RasterBuffer> raster_buffer; |
252 if (helper) | 252 if (helper) |
253 raster_buffer = helper->AcquireBufferForRaster(resource.get(), 0, 0); | 253 raster_buffer = helper->AcquireBufferForRaster(resource.get(), 0, 0); |
254 TileTask::Vector dependencies = image_decode_tasks; | 254 TileTask::Vector dependencies = image_decode_tasks; |
255 raster_tasks->push_back( | 255 raster_tasks->push_back( |
256 new PerfRasterTaskImpl(helper, std::move(resource), | 256 new PerfRasterTaskImpl(helper, std::move(resource), |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
588 RunBuildTileTaskGraphTest("1_0", 1, 0); | 588 RunBuildTileTaskGraphTest("1_0", 1, 0); |
589 RunBuildTileTaskGraphTest("32_0", 32, 0); | 589 RunBuildTileTaskGraphTest("32_0", 32, 0); |
590 RunBuildTileTaskGraphTest("1_1", 1, 1); | 590 RunBuildTileTaskGraphTest("1_1", 1, 1); |
591 RunBuildTileTaskGraphTest("32_1", 32, 1); | 591 RunBuildTileTaskGraphTest("32_1", 32, 1); |
592 RunBuildTileTaskGraphTest("1_4", 1, 4); | 592 RunBuildTileTaskGraphTest("1_4", 1, 4); |
593 RunBuildTileTaskGraphTest("32_4", 32, 4); | 593 RunBuildTileTaskGraphTest("32_4", 32, 4); |
594 } | 594 } |
595 | 595 |
596 } // namespace | 596 } // namespace |
597 } // namespace cc | 597 } // namespace cc |
OLD | NEW |