cc: Separate the priority from the tile and put in new PrioritizedTile

cc/resources/picture_layer_tiling.cc

Index: cc/resources/picture_layer_tiling.cc
diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
index 015c492dcc8600d711791d76a64d4213efdf90a4..776fc09ac17973fe3da423d48b379b0d68fb500a 100644
--- a/cc/resources/picture_layer_tiling.cc
+++ b/cc/resources/picture_layer_tiling.cc
@@ -13,6 +13,7 @@
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/base/math_util.h"
+#include "cc/resources/prioritized_tile.h"
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "ui/gfx/geometry/point_conversions.h"
@@ -809,13 +810,30 @@ bool PictureLayerTiling::IsTileRequiredForDraw(const Tile* tile) const {
   return true;
 }
 
-void PictureLayerTiling::UpdateTilePriority(Tile* tile) const {
-  tile->set_priority(ComputePriorityForTile(tile));
-  tile->set_is_occluded(IsTileOccluded(tile));
+void PictureLayerTiling::UpdateRequiredStatesOnTile(Tile* tile) const {
+  DCHECK(tile);
   tile->set_required_for_activation(IsTileRequiredForActivation(tile));
   tile->set_required_for_draw(IsTileRequiredForDraw(tile));
 }
 
+PrioritizedTile PictureLayerTiling::MakePrioritizedTile(Tile* tile) const {
+  DCHECK(tile);
+  return PrioritizedTile(tile, ComputePriorityForTile(tile),
+                         IsTileOccluded(tile));
+}
+
+std::map<const Tile*, PrioritizedTile>
+PictureLayerTiling::UpdateAndGetAllPrioritizedTilesForTesting() {
+  std::map<const Tile*, PrioritizedTile> result;
+  for (const auto& key_tile_pair : tiles_) {
+    UpdateRequiredStatesOnTile(key_tile_pair.second.get());
+    PrioritizedTile prioritized_tile =
+        MakePrioritizedTile(key_tile_pair.second.get());
+    result.insert(std::make_pair(prioritized_tile.tile(), prioritized_tile));

[vmpstr, 2015/05/11 23:44:28]

This doesn't really matter in test, but this incurs an extra copy of the pair.

+  }
+  return result;
+}
+
 void PictureLayerTiling::VerifyAllTilesHaveCurrentRasterSource() const {
 #if DCHECK_IS_ON()
   for (const auto& tile_pair : tiles_)