| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef CC_TILES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_ | 5 #ifndef CC_TILES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_ |
| 6 #define CC_TILES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_ | 6 #define CC_TILES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 const PrioritizedTile& Top() const override; | 27 const PrioritizedTile& Top() const override; |
| 28 void Pop() override; | 28 void Pop() override; |
| 29 | 29 |
| 30 private: | 30 private: |
| 31 friend class RasterTilePriorityQueue; | 31 friend class RasterTilePriorityQueue; |
| 32 | 32 |
| 33 void Build(const std::vector<PictureLayerImpl*>& active_layers, | 33 void Build(const std::vector<PictureLayerImpl*>& active_layers, |
| 34 const std::vector<PictureLayerImpl*>& pending_layers, | 34 const std::vector<PictureLayerImpl*>& pending_layers, |
| 35 TreePriority tree_priority); | 35 TreePriority tree_priority); |
| 36 | 36 |
| 37 std::vector<scoped_ptr<TilingSetRasterQueueAll>>& GetNextQueues(); | 37 std::vector<std::unique_ptr<TilingSetRasterQueueAll>>& GetNextQueues(); |
| 38 const std::vector<scoped_ptr<TilingSetRasterQueueAll>>& GetNextQueues() const; | 38 const std::vector<std::unique_ptr<TilingSetRasterQueueAll>>& GetNextQueues() |
| 39 const; |
| 39 | 40 |
| 40 std::vector<scoped_ptr<TilingSetRasterQueueAll>> active_queues_; | 41 std::vector<std::unique_ptr<TilingSetRasterQueueAll>> active_queues_; |
| 41 std::vector<scoped_ptr<TilingSetRasterQueueAll>> pending_queues_; | 42 std::vector<std::unique_ptr<TilingSetRasterQueueAll>> pending_queues_; |
| 42 TreePriority tree_priority_; | 43 TreePriority tree_priority_; |
| 43 | 44 |
| 44 DISALLOW_COPY_AND_ASSIGN(RasterTilePriorityQueueAll); | 45 DISALLOW_COPY_AND_ASSIGN(RasterTilePriorityQueueAll); |
| 45 }; | 46 }; |
| 46 | 47 |
| 47 } // namespace cc | 48 } // namespace cc |
| 48 | 49 |
| 49 #endif // CC_TILES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_ | 50 #endif // CC_TILES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_ |
| OLD | NEW |