cc: Split tiling set raster queues into all and required.

cc/layers/picture_layer_impl_unittest.cc

Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 9814cad36ce3578b2c61b0e84726425c9de1d0a7..a68598d524547fc1a31eab43e8d0325227a99707 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -14,6 +14,8 @@
 #include "cc/layers/picture_layer.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
+#include "cc/resources/tiling_set_raster_queue_all.h"
+#include "cc/resources/tiling_set_raster_queue_required.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_impl_proxy.h"
@@ -1613,8 +1615,8 @@ TEST_F(NoLowResPictureLayerImplTest, MarkRequiredOffscreenTiles) {
   int num_visible = 0;
   int num_offscreen = 0;
 
-  scoped_ptr<TilingSetRasterQueue> queue =
-      pending_layer_->CreateRasterQueue(false);
+  scoped_ptr<TilingSetRasterQueue> queue(new TilingSetRasterQueueAll(
+      pending_layer_->picture_layer_tiling_set(), false));
   for (; !queue->IsEmpty(); queue->Pop()) {
     const Tile* tile = queue->Top();
     DCHECK(tile);
@@ -2753,15 +2755,13 @@ TEST_F(PictureLayerImplTest, TilingSetRasterQueue) {
   SetupPendingTree(pending_pile);
   EXPECT_EQ(2u, pending_layer_->num_tilings());
 
-  scoped_ptr<TilingSetRasterQueue> queue =
-      pending_layer_->CreateRasterQueue(false);
-
   std::set<Tile*> unique_tiles;
   bool reached_prepaint = false;
   size_t non_ideal_tile_count = 0u;
   size_t low_res_tile_count = 0u;
   size_t high_res_tile_count = 0u;
-  queue = pending_layer_->CreateRasterQueue(false);
+  scoped_ptr<TilingSetRasterQueue> queue(new TilingSetRasterQueueAll(
+      pending_layer_->picture_layer_tiling_set(), false));
   while (!queue->IsEmpty()) {
     Tile* tile = queue->Top();
     TilePriority priority = tile->priority(PENDING_TREE);
@@ -2792,6 +2792,22 @@ TEST_F(PictureLayerImplTest, TilingSetRasterQueue) {
   EXPECT_EQ(low_res_tile_count + high_res_tile_count + non_ideal_tile_count,
             unique_tiles.size());
 
+  queue.reset(new TilingSetRasterQueueRequired(
+      pending_layer_->picture_layer_tiling_set(),
+      RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW));
+  EXPECT_TRUE(queue->IsEmpty());
+
+  queue.reset(new TilingSetRasterQueueRequired(
+      pending_layer_->picture_layer_tiling_set(),
+      RasterTilePriorityQueue::Type::REQUIRED_FOR_ACTIVATION));
+  EXPECT_FALSE(queue->IsEmpty());
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
+    EXPECT_TRUE(tile->required_for_activation());
+    EXPECT_FALSE(tile->IsReadyToDraw());
+    queue->Pop();
+  }
+
   // No NOW tiles.
   time_ticks += base::TimeDelta::FromMilliseconds(200);
   host_impl_.SetCurrentBeginFrameArgs(
@@ -2804,7 +2820,8 @@ TEST_F(PictureLayerImplTest, TilingSetRasterQueue) {
 
   unique_tiles.clear();
   high_res_tile_count = 0u;
-  queue = pending_layer_->CreateRasterQueue(false);
+  queue.reset(new TilingSetRasterQueueAll(
+      pending_layer_->picture_layer_tiling_set(), false));
   while (!queue->IsEmpty()) {
     Tile* tile = queue->Top();
     TilePriority priority = tile->priority(PENDING_TREE);
@@ -2845,7 +2862,8 @@ TEST_F(PictureLayerImplTest, TilingSetRasterQueue) {
   non_ideal_tile_count = 0;
   low_res_tile_count = 0;
   high_res_tile_count = 0;
-  queue = pending_layer_->CreateRasterQueue(true);
+  queue.reset(new TilingSetRasterQueueAll(
+      pending_layer_->picture_layer_tiling_set(), true));
   while (!queue->IsEmpty()) {
     Tile* tile = queue->Top();
     TilePriority priority = tile->priority(PENDING_TREE);
@@ -3828,8 +3846,8 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
 
   // No occlusion.
   int unoccluded_tile_count = 0;
-  scoped_ptr<TilingSetRasterQueue> queue =
-      pending_layer_->CreateRasterQueue(false);
+  scoped_ptr<TilingSetRasterQueue> queue(new TilingSetRasterQueueAll(
+      pending_layer_->picture_layer_tiling_set(), false));
   while (!queue->IsEmpty()) {
     Tile* tile = queue->Top();
 
@@ -3861,7 +3879,8 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
   host_impl_.pending_tree()->UpdateDrawProperties();
 
   unoccluded_tile_count = 0;
-  queue = pending_layer_->CreateRasterQueue(false);
+  queue.reset(new TilingSetRasterQueueAll(
+      pending_layer_->picture_layer_tiling_set(), false));
   while (!queue->IsEmpty()) {
     Tile* tile = queue->Top();
 
@@ -3884,7 +3903,8 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
   host_impl_.pending_tree()->UpdateDrawProperties();
 
   unoccluded_tile_count = 0;
-  queue = pending_layer_->CreateRasterQueue(false);
+  queue.reset(new TilingSetRasterQueueAll(
+      pending_layer_->picture_layer_tiling_set(), false));
   while (!queue->IsEmpty()) {
     Tile* tile = queue->Top();