cc: Optimise shared raster tile handling in raster tile priority queue.

cc/resources/raster_tile_priority_queue.h

Index: cc/resources/raster_tile_priority_queue.h
diff --git a/cc/resources/raster_tile_priority_queue.h b/cc/resources/raster_tile_priority_queue.h
index bbfaafddef383a9e9f1e95a8f8815e8c26a8dfbd..0f384d72ff12403cc1239ff5c2e51cfecfbdd639 100644
--- a/cc/resources/raster_tile_priority_queue.h
+++ b/cc/resources/raster_tile_priority_queue.h
@@ -5,6 +5,7 @@
 #ifndef CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_H_
 #define CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_H_
 
+#include <set>
 #include <utility>
 #include <vector>
 
@@ -27,12 +28,15 @@ class CC_EXPORT RasterTilePriorityQueue {
     void Pop(TreePriority tree_priority);
 
     WhichTree NextTileIteratorTree(TreePriority tree_priority) const;
+    WhichTree PrimarySharedTileTree(TreePriority tree_priority,
+                                    const Tile* tile) const;
 
     PictureLayerImpl::LayerRasterTileIterator active_iterator;
     PictureLayerImpl::LayerRasterTileIterator pending_iterator;
+    bool has_both_layers;
 
-    // TODO(vmpstr): Investigate removing this.
-    std::vector<Tile*> returned_shared_tiles;
+    // Set of returned tiles (excluding the current one) for DCHECKing.
+    std::set<const Tile*> returned_tiles_for_debug;
   };
 
   RasterTilePriorityQueue();