Index: cc/tiles/tiling_set_raster_queue_all.cc |
diff --git a/cc/tiles/tiling_set_raster_queue_all.cc b/cc/tiles/tiling_set_raster_queue_all.cc |
index 74bf1b2f144f806cadf802723924da96fc597f33..f724966eb03b3fceff381863f32722ca20f61cbf 100644 |
--- a/cc/tiles/tiling_set_raster_queue_all.cc |
+++ b/cc/tiles/tiling_set_raster_queue_all.cc |
@@ -272,7 +272,8 @@ TilingSetRasterQueueAll::SkewportTilingIterator::SkewportTilingIterator( |
return; |
iterator_ = TilingData::SpiralDifferenceIterator( |
tiling_data_, tiling_->current_skewport_rect(), |
- tiling_->current_visible_rect(), tiling_->current_visible_rect()); |
+ tiling_->current_visible_rect(), tiling_->current_visible_rect(), |
+ TilingData::IsPyramidSequenceEnabled()); |
if (!iterator_) |
return; |
if (!GetFirstTileAndCheckIfValid(&iterator_)) { |
@@ -299,7 +300,8 @@ TilingSetRasterQueueAll::SoonBorderTilingIterator::SoonBorderTilingIterator( |
return; |
iterator_ = TilingData::SpiralDifferenceIterator( |
tiling_data_, tiling_->current_soon_border_rect(), |
- tiling_->current_skewport_rect(), tiling_->current_visible_rect()); |
+ tiling_->current_skewport_rect(), tiling_->current_visible_rect(), |
+ TilingData::IsPyramidSequenceEnabled()); |
if (!iterator_) |
return; |
if (!GetFirstTileAndCheckIfValid(&iterator_)) { |
@@ -326,7 +328,8 @@ TilingSetRasterQueueAll::EventuallyTilingIterator::EventuallyTilingIterator( |
return; |
iterator_ = TilingData::SpiralDifferenceIterator( |
tiling_data_, tiling_->current_eventually_rect(), |
- tiling_->current_skewport_rect(), tiling_->current_soon_border_rect()); |
+ tiling_->current_skewport_rect(), tiling_->current_soon_border_rect(), |
+ TilingData::IsPyramidSequenceEnabled()); |
if (!iterator_) |
return; |
if (!GetFirstTileAndCheckIfValid(&iterator_)) { |
@@ -358,9 +361,23 @@ TilingSetRasterQueueAll::TilingIterator::TilingIterator( |
current_tile_ = *visible_iterator_; |
} |
+TilingSetRasterQueueAll::TilingIterator::TilingIterator( |
+ const TilingSetRasterQueueAll::TilingIterator& other) = default; |
+ |
+TilingSetRasterQueueAll::TilingIterator::TilingIterator( |
+ TilingSetRasterQueueAll::TilingIterator&& other) = default; |
+ |
TilingSetRasterQueueAll::TilingIterator::~TilingIterator() { |
} |
+TilingSetRasterQueueAll::TilingIterator& |
+TilingSetRasterQueueAll::TilingIterator::operator=( |
+ const TilingSetRasterQueueAll::TilingIterator& other) = default; |
+ |
+TilingSetRasterQueueAll::TilingIterator& |
+TilingSetRasterQueueAll::TilingIterator::operator=( |
+ TilingSetRasterQueueAll::TilingIterator&& other) = default; |
+ |
void TilingSetRasterQueueAll::TilingIterator::AdvancePhase() { |
DCHECK_LT(phase_, Phase::EVENTUALLY_RECT); |