cc: Keep PaintImage in DrawImage.

cc/raster/image_hijack_canvas.cc

 // 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.
 
 #include "cc/raster/image_hijack_canvas.h"
 
 #include "base/optional.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/paint/discardable_image_map.h"
 #include "cc/tiles/image_decode_cache.h"
 #include "third_party/skia/include/core/SkPath.h"
 
 namespace cc {
 namespace {
 
+// Using a single id for images captured using the hijack canvas.
+// TODO(khushalsagar): This should not be necessary once this is eliminated and
+// we replace images while iterating through the ops in PaintOpBuffer.
+PaintImage::Id s_canvas_paint_image_id = PaintImage::GetNextId();

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

I think this should be a static int instead of GetNextId call. 

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

Do you mean like kNonLazyStableId?

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

Either kNonLazyStableId or some other identifier, but yes, any static value
other than GetNextId()

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

Done. I added a kWrongStableId to mark it clearly that this use is incorrect.
Filed a bug as well about the cases where this is being used right now.

+
 SkIRect RoundOutRect(const SkRect& rect) {
   SkIRect result;
   rect.roundOut(&result);
   return result;
 }
 
 class ScopedDecodedImageLock {
  public:
   ScopedDecodedImageLock(ImageDecodeCache* image_decode_cache,
-                         sk_sp<const SkImage> image,
+                         sk_sp<SkImage> image,
                          const SkRect& src_rect,
                          const SkMatrix& matrix,
                          const SkPaint* paint,
                          const gfx::ColorSpace& target_color_space)
       : image_decode_cache_(image_decode_cache),
-        draw_image_(std::move(image),
+        draw_image_(PaintImage(s_canvas_paint_image_id, std::move(image)),
                     RoundOutRect(src_rect),
                     paint ? paint->getFilterQuality() : kNone_SkFilterQuality,
                     matrix,
                     target_color_space),
         decoded_draw_image_(
             image_decode_cache_->GetDecodedImageForDraw(draw_image_)) {
     DCHECK(draw_image_.image()->isLazyGenerated());
     if (paint) {
       decoded_paint_ = *paint;
       decoded_paint_->setFilterQuality(decoded_draw_image_.filter_quality());
@@ skipping 45 matching lines @@
     SkMatrix matrix;
     SkShader::TileMode xy[2];
     SkImage* image = shader->isAImage(&matrix, xy);
     if (!image || !image->isLazyGenerated())
       return base::Optional<ScopedImagePaint>();
 
     SkMatrix total_image_matrix = matrix;
     total_image_matrix.preConcat(ctm);
 
     ScopedDecodedImageLock scoped_lock(
-        image_decode_cache, sk_ref_sp(image),
+        image_decode_cache, sk_ref_sp(const_cast<SkImage*>(image)),

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

image is already non const?

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

Done.

         SkRect::MakeIWH(image->width(), image->height()), total_image_matrix,
         &paint, target_color_space);
     const DecodedDrawImage& decoded_image = scoped_lock.decoded_image();
     if (!decoded_image.image())
       return base::Optional<ScopedImagePaint>();
 
     bool need_scale = !decoded_image.is_scale_adjustment_identity();
     if (need_scale) {
       matrix.preScale(1.f / decoded_image.scale_adjustment().width(),
                       1.f / decoded_image.scale_adjustment().height());
@@ skipping 18 matching lines @@
 const SkImage* GetImageInPaint(const SkPaint& paint) {
   SkShader* shader = paint.getShader();
   return shader ? shader->isAImage(nullptr, nullptr) : nullptr;
 }
 
 }  // namespace
 
 ImageHijackCanvas::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)
     : SkNWayCanvas(width, height),
       image_decode_cache_(image_decode_cache),
       images_to_skip_(images_to_skip),
       target_color_space_(target_color_space) {}
 
 void ImageHijackCanvas::onDrawPicture(const SkPicture* picture,
                                       const SkMatrix* matrix,
                                       const SkPaint* paint) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
@@ skipping 19 matching lines @@
     SkNWayCanvas::onDrawImage(image, x, y, paint);
     return;
   }
 
   if (ShouldSkipImage(image))
     return;
 
   SkMatrix ctm = getTotalMatrix();
 
   ScopedDecodedImageLock scoped_lock(
-      image_decode_cache_, sk_ref_sp(image),
+      image_decode_cache_, sk_ref_sp(const_cast<SkImage*>(image)),
       SkRect::MakeIWH(image->width(), image->height()), ctm, paint,
       target_color_space_);
   const DecodedDrawImage& decoded_image = scoped_lock.decoded_image();
   if (!decoded_image.image())
     return;
 
   DCHECK_EQ(0, static_cast<int>(decoded_image.src_rect_offset().width()));
   DCHECK_EQ(0, static_cast<int>(decoded_image.src_rect_offset().height()));
   const SkPaint* decoded_paint = scoped_lock.decoded_paint();
 
@@ skipping 29 matching lines @@
 
   SkRect src_storage;
   if (!src) {
     src_storage = SkRect::MakeIWH(image->width(), image->height());
     src = &src_storage;
   }
   SkMatrix matrix;
   matrix.setRectToRect(*src, dst, SkMatrix::kFill_ScaleToFit);
   matrix.postConcat(getTotalMatrix());
 
-  ScopedDecodedImageLock scoped_lock(image_decode_cache_, sk_ref_sp(image),
+  ScopedDecodedImageLock scoped_lock(image_decode_cache_,
+                                     sk_ref_sp(const_cast<SkImage*>(image)),
                                      *src, matrix, paint, target_color_space_);
   const DecodedDrawImage& decoded_image = scoped_lock.decoded_image();
   if (!decoded_image.image())
     return;
 
   const SkPaint* decoded_paint = scoped_lock.decoded_paint();
 
   SkRect adjusted_src =
       src->makeOffset(decoded_image.src_rect_offset().width(),
                       decoded_image.src_rect_offset().height());
@@ skipping 131 matching lines @@
     SkRect tmp = rect;
     if (paint)
       paint->computeFastBounds(tmp, &tmp);
     return quickReject(tmp);
   }
 
   return false;
 }
 
 }  // namespace cc