cc: Keep PaintImage in DrawImage.

cc/tiles/tile_manager.h

Index: cc/tiles/tile_manager.h
diff --git a/cc/tiles/tile_manager.h b/cc/tiles/tile_manager.h
index cfff719c320c0cf681315b178277bfd63636844e..8c49de2063727059ba118d5e5643fd71c72f5f17 100644
--- a/cc/tiles/tile_manager.h
+++ b/cc/tiles/tile_manager.h
@@ -150,7 +150,7 @@ class CC_EXPORT TileManager : CheckerImageTrackerClient {
   bool IsReadyToActivate() const;
   bool IsReadyToDraw() const;
 
-  const ImageIdFlatSet& TakeImagesToInvalidateOnSyncTree();
+  const PaintImageIdFlatSet& TakeImagesToInvalidateOnSyncTree();
   void DidActivateSyncTree();
 
   std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
@@ -328,11 +328,10 @@ class CC_EXPORT TileManager : CheckerImageTrackerClient {
   PrioritizedWorkToSchedule AssignGpuMemoryToTiles();
   void ScheduleTasks(const PrioritizedWorkToSchedule& work_to_schedule);
 
-  void PartitionImagesForCheckering(
-      const PrioritizedTile& prioritized_tile,
-      const gfx::ColorSpace& raster_color_space,
-      std::vector<DrawImage>* sync_decoded_images,
-      std::vector<sk_sp<const SkImage>>* checkered_images);
+  void PartitionImagesForCheckering(const PrioritizedTile& prioritized_tile,
+                                    const gfx::ColorSpace& raster_color_space,
+                                    std::vector<DrawImage>* sync_decoded_images,
+                                    std::vector<PaintImage>* checkered_images);
   void AddCheckeredImagesToDecodeQueue(
       const PrioritizedTile& prioritized_tile,
       const gfx::ColorSpace& raster_color_space,