Chromium -> Mojo roll.

cc/resources/picture_layer_tiling_set.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
 #define CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 94 matching lines @@
   // Remove all tiles; keep all tilings.
   void RemoveAllTiles();
 
   // Update the rects and priorities for tiles based on the given information.
   bool UpdateTilePriorities(const gfx::Rect& required_rect_in_layer_space,
                             float ideal_contents_scale,
                             double current_frame_time_in_seconds,
                             const Occlusion& occlusion_in_layer_space,
                             bool can_require_tiles_for_activation);
 
-  void GetAllTilesForTracing(std::set<const Tile*>* tiles) const;
+  void GetAllTilesAndPrioritiesForTracing(
+      std::map<const Tile*, TilePriority>* tile_map) const;
 
   // For a given rect, iterates through tiles that can fill it.  If no
   // set of tiles with resources can fill the rect, then it will iterate
   // through null tiles with valid geometry_rect() until the rect is full.
   // If all tiles have resources, the union of all geometry_rects will
   // exactly fill rect with no overlap.
   class CC_EXPORT CoverageIterator {
    public:
     CoverageIterator(const PictureLayerTilingSet* set,
       float contents_scale,
@@ skipping 57 matching lines @@
   const int skewport_extrapolation_limit_in_content_pixels_;
   PictureLayerTilingClient* client_;
 
   friend class Iterator;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerTilingSet);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_