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..361dd4fb00a4c9a818ad9b115baa7edf235b668a 100644
--- a/cc/paint/image_id.h
+++ b/cc/paint/image_id.h
@@ -9,12 +9,18 @@
 #include <unordered_set>
 
 #include "base/containers/flat_set.h"
+#include "cc/paint/paint_image.h"
 
 namespace cc {
 
-using ImageId = uint32_t;
+using ImageId = PaintImage::Id;

[vmpstr, 2017/05/12 22:15:42]

I just want to use PaintImage::Id

[Khushal, 2017/05/13 02:45:50]

Do you mind if that is in a follow-up patch?

[vmpstr, 2017/05/15 15:02:55]

I'd prefer we do this here.

[Khushal, 2017/05/15 21:22:14]

Done.

 using ImageIdFlatSet = base::flat_set<ImageId>;
 
+// 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
 
 #endif  // CC_PAINT_IMAGE_ID_H_