cc: Keep PaintImage in DrawImage.

cc/raster/image_hijack_canvas.h

 // Copyright 2016 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_IMAGE_HIJACK_CANVAS_H_
 #define CC_RASTER_IMAGE_HIJACK_CANVAS_H_
 
 #include <unordered_set>
 
 #include "base/macros.h"
 #include "cc/cc_export.h"
 #include "cc/paint/image_id.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 #include "ui/gfx/color_space.h"
 
 namespace cc {
 
 class ImageDecodeCache;
 
 class CC_EXPORT ImageHijackCanvas : public SkNWayCanvas {
  public:
   ImageHijackCanvas(int width,
                     int height,
                     ImageDecodeCache* image_decode_cache,
-                    const ImageIdFlatSet* images_to_skip,
+                    const SkImageIdFlatSet* images_to_skip,
                     const gfx::ColorSpace& target_color_space);
 
  private:
   // Ensure that pictures are unpacked by this canvas, instead of being
   // forwarded to the raster canvas.
   void onDrawPicture(const SkPicture* picture,
                      const SkMatrix* matrix,
                      const SkPaint* paint) override;
   void onDrawImage(const SkImage* image,
                    SkScalar x,
@@ skipping 16 matching lines @@
   void onDrawImageNine(const SkImage* image,
                        const SkIRect& center,
                        const SkRect& dst,
                        const SkPaint* paint) override;
 
   bool ShouldSkipImage(const SkImage* image) const;
   bool ShouldSkipImageInPaint(const SkPaint& paint) const;
   bool QuickRejectDraw(const SkRect& rect, const SkPaint* paint) const;
 
   ImageDecodeCache* image_decode_cache_;
-  const ImageIdFlatSet* images_to_skip_;
+  const SkImageIdFlatSet* images_to_skip_;
   const gfx::ColorSpace target_color_space_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageHijackCanvas);
 };
 
 }  // namespace cc
 
 #endif  // CC_RASTER_IMAGE_HIJACK_CANVAS_H_