cc: Keep PaintImage in DrawImage.

cc/raster/raster_source.h

Index: cc/raster/raster_source.h
diff --git a/cc/raster/raster_source.h b/cc/raster/raster_source.h
index b70f5ada9203ecb1b24a6b27657c1766ca7cbdb7..92e429bd24fe37f8b560233e25569fdcaf369f15 100644
--- a/cc/raster/raster_source.h
+++ b/cc/raster/raster_source.h
@@ -51,7 +51,7 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
     // during raster.
     // TODO(khushalsagar): Consolidate more settings for playback here? See
     // crbug.com/691076.
-    ImageIdFlatSet images_to_skip;
+    SkImageIdFlatSet images_to_skip;
   };
 
   static scoped_refptr<RasterSource> CreateFromRecordingSource(
@@ -121,7 +121,7 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
   // Valid rectangle in which everything is recorded and can be rastered from.
   virtual gfx::Rect RecordedViewport() const;
 
-  gfx::Rect GetRectForImage(ImageId image_id) const;
+  gfx::Rect GetRectForImage(PaintImage::Id image_id) const;
 
   // Tracing functionality.
   virtual void DidBeginTracing();