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

Unified Diff: cc/raster/one_copy_tile_task_worker_pool.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: cc/raster/one_copy_tile_task_worker_pool.h
diff --git a/cc/raster/one_copy_tile_task_worker_pool.h b/cc/raster/one_copy_tile_task_worker_pool.h
index f691232c33caee2269be9d2cf7e838059312de1d..1c7a89aa8431368f8e1f68cad1ee152a139644d4 100644
--- a/cc/raster/one_copy_tile_task_worker_pool.h
+++ b/cc/raster/one_copy_tile_task_worker_pool.h
@@ -45,7 +45,7 @@ class CC_EXPORT OneCopyTileTaskWorkerPool
public:
~OneCopyTileTaskWorkerPool() override;
- static scoped_ptr<TileTaskWorkerPool> Create(
+ static std::unique_ptr<TileTaskWorkerPool> Create(
base::SequencedTaskRunner* task_runner,
TaskGraphRunner* task_graph_runner,
ContextProvider* context_provider,
@@ -66,11 +66,11 @@ class CC_EXPORT OneCopyTileTaskWorkerPool
bool GetResourceRequiresSwizzle(bool must_support_alpha) const override;
// Overridden from TileTaskClient:
- scoped_ptr<RasterBuffer> AcquireBufferForRaster(
+ std::unique_ptr<RasterBuffer> AcquireBufferForRaster(
const Resource* resource,
uint64_t resource_content_id,
uint64_t previous_content_id) override;
- void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override;
+ void ReleaseBufferForRaster(std::unique_ptr<RasterBuffer> buffer) override;
// Overridden from base::trace_event::MemoryDumpProvider:
bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
@@ -109,7 +109,7 @@ class CC_EXPORT OneCopyTileTaskWorkerPool
const gfx::Size size;
const ResourceFormat format;
- scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer;
+ std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer;
base::TimeTicks last_usage;
unsigned texture_id;
unsigned image_id;
@@ -122,14 +122,16 @@ class CC_EXPORT OneCopyTileTaskWorkerPool
void RemoveStagingBuffer(const StagingBuffer* staging_buffer);
void MarkStagingBufferAsFree(const StagingBuffer* staging_buffer);
void MarkStagingBufferAsBusy(const StagingBuffer* staging_buffer);
- scoped_ptr<StagingBuffer> AcquireStagingBuffer(const Resource* resource,
- uint64_t previous_content_id);
+ std::unique_ptr<StagingBuffer> AcquireStagingBuffer(
+ const Resource* resource,
+ uint64_t previous_content_id);
base::TimeTicks GetUsageTimeForLRUBuffer();
void ScheduleReduceMemoryUsage();
void ReduceMemoryUsage();
void ReleaseBuffersNotUsedSince(base::TimeTicks time);
- scoped_ptr<base::trace_event::ConvertableToTraceFormat> StateAsValue() const;
+ std::unique_ptr<base::trace_event::ConvertableToTraceFormat> StateAsValue()
+ const;
void StagingStateAsValueInto(
base::trace_event::TracedValue* staging_state) const;
@@ -146,7 +148,7 @@ class CC_EXPORT OneCopyTileTaskWorkerPool
// |lock_| must be acquired when accessing the following members.
using StagingBufferSet = std::set<const StagingBuffer*>;
StagingBufferSet buffers_;
- using StagingBufferDeque = std::deque<scoped_ptr<StagingBuffer>>;
+ using StagingBufferDeque = std::deque<std::unique_ptr<StagingBuffer>>;
StagingBufferDeque free_buffers_;
StagingBufferDeque busy_buffers_;
int bytes_scheduled_since_last_flush_;

Powered by Google App Engine
This is Rietveld 408576698