cc: Rework how picture layer tiling set gets into raster queues.

cc/resources/raster_tile_priority_queue_all.h

Index: cc/resources/raster_tile_priority_queue_all.h
diff --git a/cc/resources/raster_tile_priority_queue_all.h b/cc/resources/raster_tile_priority_queue_all.h
index 4bd10852275bf05df4ffe3178f4240cb1f8ca068..0f89935d95a88e0135600171be2e59829be39c2d 100644
--- a/cc/resources/raster_tile_priority_queue_all.h
+++ b/cc/resources/raster_tile_priority_queue_all.h
@@ -9,6 +9,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/containers/hash_tables.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/resources/raster_tile_priority_queue.h"
@@ -22,7 +23,8 @@ class CC_EXPORT RasterTilePriorityQueueAll : public RasterTilePriorityQueue {
   class PairedTilingSetQueue {
    public:
     PairedTilingSetQueue();
-    PairedTilingSetQueue(const PictureLayerImpl::Pair& layer_pair,
+    PairedTilingSetQueue(PictureLayerTilingSet* active,
+                         PictureLayerTilingSet* pending,
                          TreePriority tree_priority);
     ~PairedTilingSetQueue();
 
@@ -46,7 +48,7 @@ class CC_EXPORT RasterTilePriorityQueueAll : public RasterTilePriorityQueue {
    private:
     scoped_ptr<TilingSetRasterQueueAll> active_queue_;
     scoped_ptr<TilingSetRasterQueueAll> pending_queue_;
-    bool has_both_layers_;
+    bool has_both_tiling_sets_;
 
     // Set of returned tiles (excluding the current one) for DCHECKing.
     std::set<const Tile*> returned_tiles_for_debug_;
@@ -62,7 +64,9 @@ class CC_EXPORT RasterTilePriorityQueueAll : public RasterTilePriorityQueue {
  private:
   friend class RasterTilePriorityQueue;
 
-  void Build(const std::vector<PictureLayerImpl::Pair>& paired_layers,
+  void Build(const base::hash_map<int, PictureLayerTilingSet::Pair>&
+                 paired_picture_layer_tiling_sets,
+             bool has_pending_tree,
              TreePriority tree_priority);
 
   // TODO(vmpstr): This is potentially unnecessary if it becomes the case that