Update GatherPixelRefDevice to the new SkImage/SkPixelRef API

skia/ext/pixel_ref_utils.cc

 // 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.
 
 #include "skia/ext/pixel_ref_utils.h"
 
 #include <algorithm>
 
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkDraw.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
 #include "third_party/skia/include/utils/SkNoSaveLayerCanvas.h"
 #include "third_party/skia/src/core/SkRasterClip.h"
 
 namespace skia {
 
 namespace {
 
-// URI label for a discardable SkPixelRef.
-const char kLabelDiscardable[] = "discardable";
-
 class DiscardablePixelRefSet {
  public:
   DiscardablePixelRefSet(
       std::vector<PixelRefUtils::PositionPixelRef>* pixel_refs)
       : pixel_refs_(pixel_refs) {}
 
   void Add(SkPixelRef* pixel_ref,
            const SkRect& rect,
            const SkMatrix& matrix,
            SkFilterQuality filter_quality) {
-    // Only save discardable pixel refs.
-    if (pixel_ref->getURI() &&
-        !strcmp(pixel_ref->getURI(), kLabelDiscardable)) {
-      PixelRefUtils::PositionPixelRef position_pixel_ref;
-      position_pixel_ref.pixel_ref = pixel_ref;
-      position_pixel_ref.pixel_ref_rect = rect;
-      position_pixel_ref.matrix = matrix;
-      position_pixel_ref.filter_quality = filter_quality;
-      pixel_refs_->push_back(position_pixel_ref);
-    }
+    // We should only be saving discardable pixel refs.
+    SkASSERT(pixel_ref);
+    SkASSERT(pixel_ref->isLazyGenerated());
+
+    PixelRefUtils::PositionPixelRef position_pixel_ref;
+    position_pixel_ref.pixel_ref = pixel_ref;
+    position_pixel_ref.pixel_ref_rect = rect;
+    position_pixel_ref.matrix = matrix;
+    position_pixel_ref.filter_quality = filter_quality;
+    pixel_refs_->push_back(position_pixel_ref);
   }
 
  private:
   std::vector<PixelRefUtils::PositionPixelRef>* pixel_refs_;
 };
 
 class GatherPixelRefDevice : public SkBitmapDevice {
  public:
   GatherPixelRefDevice(const SkBitmap& bm,
                        DiscardablePixelRefSet* pixel_ref_set)
@@ skipping 117 matching lines @@
     matrix.mapRect(&mapped_rect, bitmap_rect);
 
     SkMatrix identity;
     identity.setIdentity();
     // Sprites aren't affected by current matrix, so use the identity matrix.
     AddBitmap(bitmap, mapped_rect, identity, paint.getFilterQuality());
     SkBitmap paint_bitmap;
     if (GetBitmapFromPaint(paint, &paint_bitmap))
       AddBitmap(paint_bitmap, mapped_rect, identity, paint.getFilterQuality());
   }
+  void drawImage(const SkDraw& draw,
+                 const SkImage* image,
+                 SkScalar x,
+                 SkScalar y,
+                 const SkPaint& paint) override {
+    const SkMatrix image_matrix = SkMatrix::MakeTrans(x, y);
+    DrawImageInternal(draw, image, image_matrix, paint);
+  }
+  void drawImageRect(const SkDraw& draw,
+                     const SkImage* image,
+                     const SkRect* src_or_null,
+                     const SkRect& dst,
+                     const SkPaint& paint,
+                     SkCanvas::SrcRectConstraint) override {
+    const SkRect src = src_or_null
+        ? *src_or_null
+        : SkRect::MakeIWH(image->width(), image->height());
+    const SkMatrix image_matrix =
+        SkMatrix::MakeRectToRect(src, dst, SkMatrix::kFill_ScaleToFit);
+    DrawImageInternal(draw, image, image_matrix, paint);
+  }
   void drawText(const SkDraw& draw,
                 const void* text,
                 size_t len,
                 SkScalar x,
                 SkScalar y,
                 const SkPaint& paint) override {
     SkBitmap bitmap;
     if (!GetBitmapFromPaint(paint, &bitmap))
       return;
 
@@ skipping 151 matching lines @@
     return false;
   }
 
  private:
   DiscardablePixelRefSet* pixel_ref_set_;
 
   void AddBitmap(const SkBitmap& bm,
                  const SkRect& rect,
                  const SkMatrix& matrix,
                  SkFilterQuality filter_quality) {
-    SkRect canvas_rect = SkRect::MakeWH(width(), height());
-    if (rect.intersects(canvas_rect)) {
+    const SkRect canvas_rect = SkRect::Make(imageInfo().bounds());
+    if (rect.intersects(canvas_rect) && bm.pixelRef()->isLazyGenerated()) {
       pixel_ref_set_->Add(bm.pixelRef(), rect, matrix, filter_quality);
     }
   }
 
+  void AddImage(const SkImage* image,
+                const SkRect& rect,
+                const SkMatrix& matrix,
+                SkFilterQuality filter_quality) {
+    const SkRect canvas_rect = SkRect::Make(imageInfo().bounds());
+    if (rect.intersects(canvas_rect) && image->isLazyGenerated()) {
+      SkBitmap bm;
+      if (image->asLegacyBitmap(&bm, SkImage::kRO_LegacyBitmapMode) && bm.pixelRef()) {
+        pixel_ref_set_->Add(bm.pixelRef(), rect, matrix, filter_quality);
+      }
+    }
+  }
+
   bool GetBitmapFromPaint(const SkPaint& paint, SkBitmap* bm) {
     SkShader* shader = paint.getShader();
     if (shader) {
       // Check whether the shader is a gradient in order to prevent generation
       // of bitmaps from gradient shaders, which implement asABitmap.
       if (SkShader::kNone_GradientType == shader->asAGradient(NULL))
         return shader->asABitmap(bm, NULL, NULL);
     }
     return false;
   }
+
+  void DrawImageInternal(const SkDraw& draw,
+                         const SkImage* image,
+                         const SkMatrix& matrix,
+                         const SkPaint& paint) {
+      const SkMatrix total_matrix = SkMatrix::Concat(*draw.fMatrix, matrix);
+      const SkRect image_rect = SkRect::MakeIWH(image->width(), image->height());
+      SkRect mapped_rect;
+      total_matrix.mapRect(&mapped_rect, image_rect);
+      AddImage(image, mapped_rect, total_matrix, paint.getFilterQuality());
+
+      SkBitmap paint_bitmap;
+      if (GetBitmapFromPaint(paint, &paint_bitmap)) {
+        AddBitmap(paint_bitmap, mapped_rect, total_matrix,
+                  paint.getFilterQuality());
+      }
+  }
 };
 
 }  // namespace
 
 void PixelRefUtils::GatherDiscardablePixelRefs(
     SkPicture* picture,
     std::vector<PositionPixelRef>* pixel_refs) {
   pixel_refs->clear();
   DiscardablePixelRefSet pixel_ref_set(pixel_refs);
 
   SkRect picture_bounds = picture->cullRect();
   SkIRect picture_ibounds = picture_bounds.roundOut();
   SkBitmap empty_bitmap;
   // Use right/bottom as the size so that we don't need a translate and, as a
   // result, the information is returned relative to the picture's origin.
   empty_bitmap.setInfo(SkImageInfo::MakeUnknown(picture_ibounds.right(),
                                                 picture_ibounds.bottom()));
 
   GatherPixelRefDevice device(empty_bitmap, &pixel_ref_set);
   SkNoSaveLayerCanvas canvas(&device);
 
   canvas.drawPicture(picture);
 }
 
 }  // namespace skia