Index: cc/resources/tiling_set_raster_queue_all.cc |
diff --git a/cc/resources/tiling_set_raster_queue.cc b/cc/resources/tiling_set_raster_queue_all.cc |
similarity index 86% |
rename from cc/resources/tiling_set_raster_queue.cc |
rename to cc/resources/tiling_set_raster_queue_all.cc |
index 53fc992cccb980199e99f70ccfcdedfce1964698..bada935ab760a00f19125cb017d050f57f3f320c 100644 |
--- a/cc/resources/tiling_set_raster_queue.cc |
+++ b/cc/resources/tiling_set_raster_queue_all.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "cc/resources/tiling_set_raster_queue.h" |
+#include "cc/resources/tiling_set_raster_queue_all.h" |
#include <utility> |
@@ -12,12 +12,9 @@ |
namespace cc { |
-TilingSetRasterQueue::TilingSetRasterQueue() |
- : tiling_set_(nullptr), current_stage_(arraysize(stages_)) { |
-} |
- |
-TilingSetRasterQueue::TilingSetRasterQueue(PictureLayerTilingSet* tiling_set, |
- bool prioritize_low_res) |
+TilingSetRasterQueueAll::TilingSetRasterQueueAll( |
+ PictureLayerTilingSet* tiling_set, |
+ bool prioritize_low_res) |
: tiling_set_(tiling_set), current_stage_(0) { |
DCHECK(tiling_set_); |
@@ -62,14 +59,14 @@ TilingSetRasterQueue::TilingSetRasterQueue(PictureLayerTilingSet* tiling_set, |
AdvanceToNextStage(); |
} |
-TilingSetRasterQueue::~TilingSetRasterQueue() { |
+TilingSetRasterQueueAll::~TilingSetRasterQueueAll() { |
} |
-bool TilingSetRasterQueue::IsEmpty() const { |
+bool TilingSetRasterQueueAll::IsEmpty() const { |
return current_stage_ >= arraysize(stages_); |
} |
-void TilingSetRasterQueue::Pop() { |
+void TilingSetRasterQueueAll::Pop() { |
IteratorType index = stages_[current_stage_].iterator_type; |
TilePriority::PriorityBin tile_type = stages_[current_stage_].tile_type; |
@@ -82,7 +79,7 @@ void TilingSetRasterQueue::Pop() { |
AdvanceToNextStage(); |
} |
-Tile* TilingSetRasterQueue::Top() { |
+Tile* TilingSetRasterQueueAll::Top() { |
DCHECK(!IsEmpty()); |
IteratorType index = stages_[current_stage_].iterator_type; |
@@ -92,7 +89,7 @@ Tile* TilingSetRasterQueue::Top() { |
return *iterators_[index]; |
} |
-const Tile* TilingSetRasterQueue::Top() const { |
+const Tile* TilingSetRasterQueueAll::Top() const { |
DCHECK(!IsEmpty()); |
IteratorType index = stages_[current_stage_].iterator_type; |
@@ -102,7 +99,7 @@ const Tile* TilingSetRasterQueue::Top() const { |
return *iterators_[index]; |
} |
-void TilingSetRasterQueue::AdvanceToNextStage() { |
+void TilingSetRasterQueueAll::AdvanceToNextStage() { |
DCHECK_LT(current_stage_, arraysize(stages_)); |
++current_stage_; |
while (current_stage_ < arraysize(stages_)) { |
@@ -115,12 +112,13 @@ void TilingSetRasterQueue::AdvanceToNextStage() { |
} |
} |
-TilingSetRasterQueue::TilingIterator::TilingIterator() |
+TilingSetRasterQueueAll::TilingIterator::TilingIterator() |
: tiling_(NULL), current_tile_(NULL) { |
} |
-TilingSetRasterQueue::TilingIterator::TilingIterator(PictureLayerTiling* tiling, |
- TilingData* tiling_data) |
+TilingSetRasterQueueAll::TilingIterator::TilingIterator( |
+ PictureLayerTiling* tiling, |
+ TilingData* tiling_data) |
: tiling_(tiling), |
tiling_data_(tiling_data), |
phase_(VISIBLE_RECT), |
@@ -147,10 +145,10 @@ TilingSetRasterQueue::TilingIterator::TilingIterator(PictureLayerTiling* tiling, |
tiling_->UpdateTileAndTwinPriority(current_tile_); |
} |
-TilingSetRasterQueue::TilingIterator::~TilingIterator() { |
+TilingSetRasterQueueAll::TilingIterator::~TilingIterator() { |
} |
-void TilingSetRasterQueue::TilingIterator::AdvancePhase() { |
+void TilingSetRasterQueueAll::TilingIterator::AdvancePhase() { |
DCHECK_LT(phase_, EVENTUALLY_RECT); |
do { |
@@ -206,8 +204,9 @@ void TilingSetRasterQueue::TilingIterator::AdvancePhase() { |
tiling_->UpdateTileAndTwinPriority(current_tile_); |
} |
-TilingSetRasterQueue::TilingIterator& TilingSetRasterQueue::TilingIterator:: |
-operator++() { |
+TilingSetRasterQueueAll::TilingIterator& |
+ TilingSetRasterQueueAll::TilingIterator:: |
+ operator++() { |
current_tile_ = NULL; |
while (!current_tile_ || !TileNeedsRaster(current_tile_)) { |
std::pair<int, int> next_index; |