cc: Keep PaintImage in DrawImage.

cc/paint/discardable_image_map.h

 // Copyright 2015 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_PAINT_DISCARDABLE_IMAGE_MAP_H_
 #define CC_PAINT_DISCARDABLE_IMAGE_MAP_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 31 matching lines @@
   };
 
   DiscardableImageMap();
   ~DiscardableImageMap();
 
   bool empty() const { return all_images_.empty(); }
   void GetDiscardableImagesInRect(const gfx::Rect& rect,
                                   float contents_scale,
                                   const gfx::ColorSpace& target_color_space,
                                   std::vector<DrawImage>* images) const;
-  gfx::Rect GetRectForImage(ImageId image_id) const;
+  gfx::Rect GetRectForImage(PaintImage::Id image_id) const;
 
  private:
   friend class ScopedMetadataGenerator;
   friend class DiscardableImageMapTest;
 
   std::unique_ptr<DiscardableImageStore> BeginGeneratingMetadata(
       const gfx::Size& bounds);
   void EndGeneratingMetadata();
 
   std::vector<std::pair<DrawImage, gfx::Rect>> all_images_;
-  base::flat_map<ImageId, gfx::Rect> image_id_to_rect_;
+  base::flat_map<PaintImage::Id, gfx::Rect> image_id_to_rect_;
 
   RTree images_rtree_;
 };
 
 }  // namespace cc
 
 #endif  // CC_PAINT_DISCARDABLE_IMAGE_MAP_H_