| 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 507467f437147f1c5ccd694b339222c52578a7c1..10dc1f72ef7b37a2a096f925290d1e656eefcf6b 100644
|
| --- a/cc/tiles/raster_tile_priority_queue_all.h
|
| +++ b/cc/tiles/raster_tile_priority_queue_all.h
|
| @@ -33,11 +33,11 @@ class CC_EXPORT RasterTilePriorityQueueAll : public RasterTilePriorityQueue {
|
| const std::vector<PictureLayerImpl*>& pending_layers,
|
| TreePriority tree_priority);
|
|
|
| - ScopedPtrVector<TilingSetRasterQueueAll>& GetNextQueues();
|
| - const ScopedPtrVector<TilingSetRasterQueueAll>& GetNextQueues() const;
|
| + std::vector<scoped_ptr<TilingSetRasterQueueAll>>& GetNextQueues();
|
| + const std::vector<scoped_ptr<TilingSetRasterQueueAll>>& GetNextQueues() const;
|
|
|
| - ScopedPtrVector<TilingSetRasterQueueAll> active_queues_;
|
| - ScopedPtrVector<TilingSetRasterQueueAll> pending_queues_;
|
| + std::vector<scoped_ptr<TilingSetRasterQueueAll>> active_queues_;
|
| + std::vector<scoped_ptr<TilingSetRasterQueueAll>> pending_queues_;
|
| TreePriority tree_priority_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RasterTilePriorityQueueAll);
|
|
|