cc: Keep PaintImage in DrawImage.

cc/paint/image_id.h

Index: cc/paint/image_id.h
diff --git a/cc/paint/image_id.h b/cc/paint/image_id.h
index 0ffaafd782fb20f6869f84cb96f1cf593e212bcb..015d6616eea649a1f94a5dc08e51cf5fe35d7485 100644
--- a/cc/paint/image_id.h
+++ b/cc/paint/image_id.h
@@ -9,11 +9,16 @@
 #include <unordered_set>
 
 #include "base/containers/flat_set.h"
+#include "cc/paint/paint_image.h"
 
 namespace cc {
 
-using ImageId = uint32_t;
-using ImageIdFlatSet = base::flat_set<ImageId>;
+using PaintImageIdFlatSet = base::flat_set<PaintImage::Id>;
+
+// TODO(khushalsagar): These are only used by the hijack canvas since it uses
+// an SkCanvas to replace images. Remove once that moves to PaintOpBuffer.
+using SkImageId = uint32_t;
+using SkImageIdFlatSet = base::flat_set<SkImageId>;
 
 }  // namespace cc