Index: cc/tiles/raster_tile_priority_queue_all.cc |
diff --git a/cc/tiles/raster_tile_priority_queue_all.cc b/cc/tiles/raster_tile_priority_queue_all.cc |
index 0d54a592607ee0558de53349c83fdde3c0aaf86a..7630dca7b9bfc63c5173848786e71a87ab1037a4 100644 |
--- a/cc/tiles/raster_tile_priority_queue_all.cc |
+++ b/cc/tiles/raster_tile_priority_queue_all.cc |
@@ -21,6 +21,14 @@ class RasterOrderComparator { |
const std::unique_ptr<TilingSetRasterQueueAll>& b_queue) const { |
// Note that in this function, we have to return true if and only if |
// a is strictly lower priority than b. |
+ |
+ // If only one of a or b is a tiling set from a non-drawing layer, then a is |
+ // lower priority if it is from a non drawing layer, otherwise b is lower |
+ // priority. |
+ if (a_queue->is_non_drawing_layer() != b_queue->is_non_drawing_layer()) { |
+ return a_queue->is_non_drawing_layer(); |
+ } |
+ |
const TilePriority& a_priority = a_queue->Top().priority(); |
const TilePriority& b_priority = b_queue->Top().priority(); |
bool prioritize_low_res = tree_priority_ == SMOOTHNESS_TAKES_PRIORITY; |
@@ -63,8 +71,9 @@ void CreateTilingSetRasterQueues( |
PictureLayerTilingSet* tiling_set = layer->picture_layer_tiling_set(); |
bool prioritize_low_res = tree_priority == SMOOTHNESS_TAKES_PRIORITY; |
std::unique_ptr<TilingSetRasterQueueAll> tiling_set_queue = |
- base::MakeUnique<TilingSetRasterQueueAll>(tiling_set, |
- prioritize_low_res); |
+ base::MakeUnique<TilingSetRasterQueueAll>( |
+ tiling_set, prioritize_low_res, |
+ layer->raster_even_if_not_in_rsll()); |
// Queues will only contain non empty tiling sets. |
if (!tiling_set_queue->IsEmpty()) |
queues->push_back(std::move(tiling_set_queue)); |