Index: cc/resources/raster_tile_priority_queue.h |
diff --git a/cc/resources/raster_tile_priority_queue.h b/cc/resources/raster_tile_priority_queue.h |
index 3f04e97ae9dcb0c6e045d9a20d29ff780c3eadbe..416a57a670a006e03daeaf7977d8d827b454f724 100644 |
--- a/cc/resources/raster_tile_priority_queue.h |
+++ b/cc/resources/raster_tile_priority_queue.h |
@@ -12,16 +12,17 @@ |
#include "cc/base/cc_export.h" |
#include "cc/layers/picture_layer_impl.h" |
#include "cc/resources/tile_priority.h" |
+#include "cc/resources/tiling_set_raster_queue.h" |
namespace cc { |
class CC_EXPORT RasterTilePriorityQueue { |
public: |
- struct PairedPictureLayerQueue { |
- PairedPictureLayerQueue(); |
- PairedPictureLayerQueue(const PictureLayerImpl::Pair& layer_pair, |
- TreePriority tree_priority); |
- ~PairedPictureLayerQueue(); |
+ struct PairedTilingSetQueue { |
+ PairedTilingSetQueue(); |
+ PairedTilingSetQueue(const PictureLayerImpl::Pair& layer_pair, |
+ TreePriority tree_priority); |
+ ~PairedTilingSetQueue(); |
bool IsEmpty() const; |
Tile* Top(TreePriority tree_priority); |
@@ -32,8 +33,8 @@ class CC_EXPORT RasterTilePriorityQueue { |
scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const; |
- PictureLayerImpl::LayerRasterTileIterator active_iterator; |
- PictureLayerImpl::LayerRasterTileIterator pending_iterator; |
+ scoped_ptr<TilingSetRasterQueue> active_queue; |
+ scoped_ptr<TilingSetRasterQueue> pending_queue; |
bool has_both_layers; |
// Set of returned tiles (excluding the current one) for DCHECKing. |
@@ -53,9 +54,9 @@ class CC_EXPORT RasterTilePriorityQueue { |
private: |
// TODO(vmpstr): This is potentially unnecessary if it becomes the case that |
- // PairedPictureLayerQueue is fast enough to copy. In that case, we can use |
- // objects directly (ie std::vector<PairedPictureLayerQueue>. |
- ScopedPtrVector<PairedPictureLayerQueue> paired_queues_; |
+ // PairedTilingSetQueue is fast enough to copy. In that case, we can use |
+ // objects directly (ie std::vector<PairedTilingSetQueue>. |
+ ScopedPtrVector<PairedTilingSetQueue> paired_queues_; |
TreePriority tree_priority_; |
DISALLOW_COPY_AND_ASSIGN(RasterTilePriorityQueue); |