cc: Keep PaintImage in DrawImage.

cc/raster/raster_source.h

 // Copyright 2014 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_RASTER_RASTER_SOURCE_H_
 #define CC_RASTER_RASTER_SOURCE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 33 matching lines @@
     bool skip_images;
 
     // If set to true, we will use an image hijack canvas, which enables
     // compositor image caching.
     bool use_image_hijack_canvas;
 
     // If non-empty, an image hijack canvas will be used to skip these images
     // 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(
       const RecordingSource* other,
       bool can_use_lcd_text);
 
   // Helper function to apply a few common operations before passing the canvas
   // to the shorter version. This is useful for rastering into tiles.
   // canvas is expected to be backed by a tile, with a default state.
   // raster_transform will be applied to the display list, rastering the list
@@ skipping 49 matching lines @@
   // Return true iff this raster source can raster the given rect in layer
   // space.
   bool CoversRect(const gfx::Rect& layer_rect) const;
 
   // Returns true if this raster source has anything to rasterize.
   virtual bool HasRecordings() const;
 
   // 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();
   virtual void AsValueInto(base::trace_event::TracedValue* array) const;
   virtual sk_sp<SkPicture> GetFlattenedPicture();
   virtual size_t GetMemoryUsage() const;
 
   // Return true if LCD anti-aliasing may be used when rastering text.
   virtual bool CanUseLCDText() const;
 
@@ skipping 36 matching lines @@
                     SkPicture::AbortCallback* callback = nullptr) const;
 
   void PrepareForPlaybackToCanvas(SkCanvas* canvas) const;
 
   DISALLOW_COPY_AND_ASSIGN(RasterSource);
 };
 
 }  // namespace cc
 
 #endif  // CC_RASTER_RASTER_SOURCE_H_