cc: Build Image to Region map during image meta-data generation.

cc/playback/discardable_image_map.cc

Index: cc/playback/discardable_image_map.cc
diff --git a/cc/playback/discardable_image_map.cc b/cc/playback/discardable_image_map.cc
index 7082e4a0cb56e892cc400fcaa72aa57b31ba940c..1abd6cd2ce5cbf03181616e78d0d11013d3b2f40 100644
--- a/cc/playback/discardable_image_map.cc
+++ b/cc/playback/discardable_image_map.cc
@@ -60,9 +60,11 @@ class DiscardableImagesMetadataCanvas : public SkNWayCanvas {
   DiscardableImagesMetadataCanvas(
       int width,
       int height,
-      std::vector<std::pair<DrawImage, gfx::Rect>>* image_set)
+      std::vector<std::pair<DrawImage, gfx::Rect>>* image_set,
+      ImageToRegionMap* image_to_region)
       : SkNWayCanvas(width, height),
         image_set_(image_set),
+        image_to_region_(image_to_region),
         canvas_bounds_(SkRect::MakeIWH(width, height)),
         canvas_size_(width, height) {}
 
@@ -172,12 +174,18 @@ class DiscardableImagesMetadataCanvas : public SkNWayCanvas {
 
     SkIRect src_irect;
     src_rect.roundOut(&src_irect);
+    gfx::Rect image_rect = SafeClampPaintRectToSize(paint_rect, canvas_size_);
+
+    Region& region = (*image_to_region_)[image->uniqueID()];
+    region.Union(image_rect);
+
     image_set_->push_back(std::make_pair(
         DrawImage(std::move(image), src_irect, filter_quality, matrix),
-        SafeClampPaintRectToSize(paint_rect, canvas_size_)));
+        image_rect));
   }
 
   std::vector<std::pair<DrawImage, gfx::Rect>>* image_set_;
+  ImageToRegionMap* image_to_region_;
   const SkRect canvas_bounds_;
   const gfx::Size canvas_size_;
   std::vector<SkPaint> saved_paints_;
@@ -193,7 +201,7 @@ sk_sp<SkCanvas> DiscardableImageMap::BeginGeneratingMetadata(
     const gfx::Size& bounds) {
   DCHECK(all_images_.empty());
   return sk_make_sp<DiscardableImagesMetadataCanvas>(
-      bounds.width(), bounds.height(), &all_images_);
+      bounds.width(), bounds.height(), &all_images_, &image_to_region_);
 }
 
 void DiscardableImageMap::EndGeneratingMetadata() {
@@ -213,6 +221,11 @@ void DiscardableImageMap::GetDiscardableImagesInRect(
     images->push_back(all_images_[index].first.ApplyScale(raster_scales));
 }
 
+Region DiscardableImageMap::GetRegionForImage(const SkImage* image) const {
+  const auto& it = image_to_region_.find(image->uniqueID());
+  return it == image_to_region_.end() ? Region() : it->second;
+}
+
 DiscardableImageMap::ScopedMetadataGenerator::ScopedMetadataGenerator(
     DiscardableImageMap* image_map,
     const gfx::Size& bounds)