add SkImage::NewFromBitmap

src/core/SkRecorder.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBigPicture.h"
 #include "SkCanvasPriv.h"
 #include "SkPatchUtils.h"
 #include "SkPicture.h"
 #include "SkPictureUtils.h"
 #include "SkRecorder.h"
 
+//#define WRAP_BITMAP_AS_IMAGE
+
 SkDrawableList::~SkDrawableList() {
     fArray.unrefAll();
 }
 
 SkBigPicture::SnapshotArray* SkDrawableList::newDrawableSnapshot() {
     const int count = fArray.count();
     if (0 == count) {
         return NULL;
     }
     SkAutoTMalloc<const SkPicture*> pics(count);
@@ skipping 138 matching lines @@
 
 void SkRecorder::onDrawPath(const SkPath& path, const SkPaint& paint) {
     TRY_MINIRECORDER(drawPath, path, paint);
     APPEND(DrawPath, paint, path);
 }
 
 void SkRecorder::onDrawBitmap(const SkBitmap& bitmap,
                               SkScalar left,
                               SkScalar top,
                               const SkPaint* paint) {
+#ifdef WRAP_BITMAP_AS_IMAGE
+    SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(bitmap));
+    if (image) {
+        this->onDrawImage(image, left, top, paint);
+    }
+#else
     APPEND(DrawBitmap, this->copy(paint), bitmap, left, top);
+#endif
 }
 
 void SkRecorder::onDrawBitmapRect(const SkBitmap& bitmap,
                                   const SkRect* src,
                                   const SkRect& dst,
                                   const SkPaint* paint,
                                   DrawBitmapRectFlags flags) {
+#ifdef WRAP_BITMAP_AS_IMAGE
+    SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(bitmap));
+    if (image) {
+        this->onDrawImageRect(image, src, dst, paint);
+    }
+#else
     TRY_MINIRECORDER(drawBitmapRectToRect, bitmap, src, dst, paint, flags);

[robertphillips, 2015/07/06 20:43:47]

What happened to this code?

[reed2, 2015/07/07 01:18:03]

Twas lost in a manual merge. Restored.

[mtklein, 2015/07/06 21:02:27]

I support this approach both as a hack and a long term change to pictures.  That
said, if we do it for real, we'll need to implement drawImageRect() on
SkMiniRecorder to keep up the status quo here.  (It's a near trivial change.) 
Otherwise we'll use SkBigPictures for all those singleton drawBitmapRect()
calls.

[reed2, 2015/07/07 01:18:03]

Gotcha. Yes, this is just a testing-experiment for now.

-    if (kBleed_DrawBitmapRectFlag == flags) {
-        APPEND(DrawBitmapRectToRectBleed,
-               this->copy(paint), bitmap, this->copy(src), dst);
-        return;
-    }
-    SkASSERT(kNone_DrawBitmapRectFlag == flags);
-    APPEND(DrawBitmapRectToRect,
-           this->copy(paint), bitmap, this->copy(src), dst);
+#endif
 }
 
 void SkRecorder::onDrawBitmapNine(const SkBitmap& bitmap,
                                   const SkIRect& center,
                                   const SkRect& dst,
                                   const SkPaint* paint) {
+#ifdef WRAP_BITMAP_AS_IMAGE
+    SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(bitmap));
+    if (image) {
+        this->onDrawImageNine(image, center, dst, paint);
+    }
+#else
     APPEND(DrawBitmapNine, this->copy(paint), bitmap, center, dst);
+#endif
 }
 
 void SkRecorder::onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
                              const SkPaint* paint) {
     APPEND(DrawImage, this->copy(paint), image, left, top);
 }
 
 void SkRecorder::onDrawImageRect(const SkImage* image, const SkRect* src,
                                  const SkRect& dst,
                                  const SkPaint* paint) {
@@ skipping 145 matching lines @@
     INHERITED(onClipPath, path, op, edgeStyle);
     SkRecords::RegionOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
     APPEND(ClipPath, this->devBounds(), path, opAA);
 }
 
 void SkRecorder::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
     INHERITED(onClipRegion, deviceRgn, op);
     APPEND(ClipRegion, this->devBounds(), deviceRgn, op);
 }