Revert of cc: Build Image to Region map during image meta-data generation. (patchset #6 id:100001 o…

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