| Index: cc/tiles/raster_tile_priority_queue_all.h
|
| diff --git a/cc/tiles/raster_tile_priority_queue_all.h b/cc/tiles/raster_tile_priority_queue_all.h
|
| index 275a73183bdf4ee08a79c2eb323972f0c0d69e35..af4983ae51bf9eebcb87ac4b6580310720afc2f9 100644
|
| --- a/cc/tiles/raster_tile_priority_queue_all.h
|
| +++ b/cc/tiles/raster_tile_priority_queue_all.h
|
| @@ -34,11 +34,12 @@ class CC_EXPORT RasterTilePriorityQueueAll : public RasterTilePriorityQueue {
|
| const std::vector<PictureLayerImpl*>& pending_layers,
|
| TreePriority tree_priority);
|
|
|
| - std::vector<scoped_ptr<TilingSetRasterQueueAll>>& GetNextQueues();
|
| - const std::vector<scoped_ptr<TilingSetRasterQueueAll>>& GetNextQueues() const;
|
| + std::vector<std::unique_ptr<TilingSetRasterQueueAll>>& GetNextQueues();
|
| + const std::vector<std::unique_ptr<TilingSetRasterQueueAll>>& GetNextQueues()
|
| + const;
|
|
|
| - std::vector<scoped_ptr<TilingSetRasterQueueAll>> active_queues_;
|
| - std::vector<scoped_ptr<TilingSetRasterQueueAll>> pending_queues_;
|
| + std::vector<std::unique_ptr<TilingSetRasterQueueAll>> active_queues_;
|
| + std::vector<std::unique_ptr<TilingSetRasterQueueAll>> pending_queues_;
|
| TreePriority tree_priority_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RasterTilePriorityQueueAll);
|
|
|