turn bitmaps into images during recording

include/private/SkRecords.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkRecords_DEFINED
 #define SkRecords_DEFINED
 
@@ skipping 35 matching lines @@
     M(Restore)                                                      \
     M(Save)                                                         \
     M(SaveLayer)                                                    \
     M(SetMatrix)                                                    \
     M(TranslateZ)                                                   \
     M(Concat)                                                       \
     M(ClipPath)                                                     \
     M(ClipRRect)                                                    \
     M(ClipRect)                                                     \
     M(ClipRegion)                                                   \
-    M(DrawBitmap)                                                   \
-    M(DrawBitmapNine)                                               \
-    M(DrawBitmapRect)                                               \
-    M(DrawBitmapRectFast)                                           \
-    M(DrawBitmapRectFixedSize)                                      \
     M(DrawDrawable)                                                 \
     M(DrawImage)                                                    \
     M(DrawImageRect)                                                \
     M(DrawImageNine)                                                \
     M(DrawDRRect)                                                   \
     M(DrawOval)                                                     \
     M(DrawPaint)                                                    \
     M(DrawPath)                                                     \
     M(DrawPatch)                                                    \
     M(DrawPicture)                                                  \
@@ skipping 79 matching lines @@
 
     ACT_AS_PTR(fPtr);
 private:
     T* fPtr;
 };
 
 #undef ACT_AS_PTR
 
 // Like SkBitmap, but deep copies pixels if they're not immutable.
 // Using this, we guarantee the immutability of all bitmaps we record.
 class ImmutableBitmap : SkNoncopyable {

[mtklein, 2016/07/26 21:16:14]

I think this class can die?

[reed1, 2016/07/28 16:26:45]

Done.

 public:
     ImmutableBitmap() {}
     ImmutableBitmap(const SkBitmap& bitmap);
     ImmutableBitmap(ImmutableBitmap&& o) {
         fBitmap.swap(o.fBitmap);
     }
 
     int width()  const { return fBitmap.width();  }
     int height() const { return fBitmap.height(); }
 
@@ skipping 70 matching lines @@
 RECORD(ClipRect, 0,
         SkIRect devBounds;
         SkRect rect;
         RegionOpAndAA opAA);
 RECORD(ClipRegion, 0,
         SkIRect devBounds;
         SkRegion region;
         SkRegion::Op op);
 
 // While not strictly required, if you have an SkPaint, it's fastest to put it first.
-RECORD(DrawBitmap, kDraw_Tag|kHasImage_Tag,
-        Optional<SkPaint> paint;
-        ImmutableBitmap bitmap;
-        SkScalar left;
-        SkScalar top);
-RECORD(DrawBitmapNine, kDraw_Tag|kHasImage_Tag,
-        Optional<SkPaint> paint;
-        ImmutableBitmap bitmap;
-        SkIRect center;
-        SkRect dst);
-RECORD(DrawBitmapRect, kDraw_Tag|kHasImage_Tag,
-        Optional<SkPaint> paint;
-        ImmutableBitmap bitmap;
-        Optional<SkRect> src;
-        SkRect dst);
-RECORD(DrawBitmapRectFast, kDraw_Tag|kHasImage_Tag,
-        Optional<SkPaint> paint;
-        ImmutableBitmap bitmap;
-        Optional<SkRect> src;
-        SkRect dst);
-RECORD(DrawBitmapRectFixedSize, kDraw_Tag|kHasImage_Tag,
-        SkPaint paint;
-        ImmutableBitmap bitmap;
-        SkRect src;
-        SkRect dst;
-        SkCanvas::SrcRectConstraint constraint);
 RECORD(DrawDRRect, kDraw_Tag,
         SkPaint paint;
         SkRRect outer;
         SkRRect inner);
 RECORD(DrawDrawable, kDraw_Tag,
         Optional<SkMatrix> matrix;
         SkRect worstCaseBounds;
         int32_t index);
 RECORD(DrawImage, kDraw_Tag|kHasImage_Tag,
         Optional<SkPaint> paint;
@@ skipping 99 matching lines @@
         int indexCount);
 RECORD(DrawAnnotation, 0,
        SkRect rect;
        SkString key;
        RefBox<SkData> value);
 #undef RECORD
 
 }  // namespace SkRecords
 
 #endif//SkRecords_DEFINED