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

cc/resources/raster_tile_priority_queue.cc

Index: cc/resources/raster_tile_priority_queue.cc
diff --git a/cc/resources/raster_tile_priority_queue.cc b/cc/resources/raster_tile_priority_queue.cc
index 9b7942d05631f7263e41529a7e3edfd3a1683d92..cc0fb778f603424d965cae4ed2ff706645ea206e 100644
--- a/cc/resources/raster_tile_priority_queue.cc
+++ b/cc/resources/raster_tile_priority_queue.cc
@@ -4,6 +4,9 @@
 
 #include "cc/resources/raster_tile_priority_queue.h"
 
+#include "cc/resources/tiling_set_raster_queue_all.h"
+#include "cc/resources/tiling_set_raster_queue_required.h"
+
 namespace cc {
 
 namespace {
@@ -124,6 +127,23 @@ WhichTree HigherPriorityTree(TreePriority tree_priority,
   }
 }
 
+scoped_ptr<TilingSetRasterQueue> CreateTilingSetRasterQueue(
+    PictureLayerImpl* layer,
+    TreePriority tree_priority,
+    RasterTilePriorityQueue::Type type) {
+  if (!layer)
+    return nullptr;
+  PictureLayerTilingSet* tiling_set = layer->picture_layer_tiling_set();
+  if (!tiling_set)
+    return nullptr;
+
+  if (type == RasterTilePriorityQueue::Type::ALL) {
+    return make_scoped_ptr(new TilingSetRasterQueueAll(
+        tiling_set, tree_priority == SMOOTHNESS_TAKES_PRIORITY));
+  }
+  return make_scoped_ptr(new TilingSetRasterQueueRequired(tiling_set, type));
+}
+
 }  // namespace
 
 RasterTilePriorityQueue::RasterTilePriorityQueue() {
@@ -134,14 +154,15 @@ RasterTilePriorityQueue::~RasterTilePriorityQueue() {
 
 void RasterTilePriorityQueue::Build(
     const std::vector<PictureLayerImpl::Pair>& paired_layers,
-    TreePriority tree_priority) {
+    TreePriority tree_priority,
+    Type type) {
   tree_priority_ = tree_priority;
   for (std::vector<PictureLayerImpl::Pair>::const_iterator it =
            paired_layers.begin();
        it != paired_layers.end();
        ++it) {
     paired_queues_.push_back(
-        make_scoped_ptr(new PairedTilingSetQueue(*it, tree_priority_)));
+        make_scoped_ptr(new PairedTilingSetQueue(*it, tree_priority_, type)));
   }
   paired_queues_.make_heap(RasterOrderComparator(tree_priority_));
 }
@@ -173,20 +194,28 @@ RasterTilePriorityQueue::PairedTilingSetQueue::PairedTilingSetQueue() {
 
 RasterTilePriorityQueue::PairedTilingSetQueue::PairedTilingSetQueue(
     const PictureLayerImpl::Pair& layer_pair,
-    TreePriority tree_priority)
-    : has_both_layers(layer_pair.active && layer_pair.pending) {
-  if (layer_pair.active) {
-    active_queue = layer_pair.active->CreateRasterQueue(
-        tree_priority == SMOOTHNESS_TAKES_PRIORITY);
-  }
-
-  if (layer_pair.pending) {
-    pending_queue = layer_pair.pending->CreateRasterQueue(
-        tree_priority == SMOOTHNESS_TAKES_PRIORITY);
+    TreePriority tree_priority,
+    Type type)
+    : has_both_layers(false) {
+  switch (type) {
+    case RasterTilePriorityQueue::Type::ALL:
+      has_both_layers = layer_pair.active && layer_pair.pending;
+      active_queue =
+          CreateTilingSetRasterQueue(layer_pair.active, tree_priority, type);
+      pending_queue =
+          CreateTilingSetRasterQueue(layer_pair.pending, tree_priority, type);
+      break;
+    case RasterTilePriorityQueue::Type::REQUIRED_FOR_ACTIVATION:
+      pending_queue =
+          CreateTilingSetRasterQueue(layer_pair.pending, tree_priority, type);
+      break;
+    case RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW:
+      active_queue =
+          CreateTilingSetRasterQueue(layer_pair.active, tree_priority, type);
+      break;
   }
 
-  if (has_both_layers)
-    SkipTilesReturnedByTwin(tree_priority);
+  SkipTilesReturnedByTwin(tree_priority);
 
   TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
                        "PairedTilingSetQueue::PairedTilingSetQueue",
@@ -228,8 +257,7 @@ void RasterTilePriorityQueue::PairedTilingSetQueue::Pop(
   DCHECK(returned_tiles_for_debug.insert(next_queue->Top()).second);
   next_queue->Pop();
 
-  if (has_both_layers)
-    SkipTilesReturnedByTwin(tree_priority);
+  SkipTilesReturnedByTwin(tree_priority);
 
   // If no empty, use Top to do DCHECK the next iterator.
   DCHECK(IsEmpty() || Top(tree_priority));
@@ -237,6 +265,9 @@ void RasterTilePriorityQueue::PairedTilingSetQueue::Pop(
 
 void RasterTilePriorityQueue::PairedTilingSetQueue::SkipTilesReturnedByTwin(
     TreePriority tree_priority) {
+  if (!has_both_layers)
+    return;
+
   // We have both layers (active and pending) thus we can encounter shared
   // tiles twice (from the active iterator and from the pending iterator).
   while (!IsEmpty()) {