Replace old SkRecords RefBox with sk_sp.

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 68 matching lines @@
 
 // Defines SkRecords::Type, an enum of all record types.
 #define ENUM(T) T##_Type,
 enum Type { SK_RECORD_TYPES(ENUM) };
 #undef ENUM
 
 #define ACT_AS_PTR(ptr)                 \
     operator T*() const { return ptr; } \
     T* operator->() const { return ptr; }
 
-template <typename T>
-class RefBox : SkNoncopyable {
-public:
-    RefBox() {}
-    RefBox(T* obj) : fObj(SkSafeRef(obj)) {}
-    RefBox(RefBox&& o) : fObj(o.fObj) {
-        o.fObj = nullptr;
-    }
-    ~RefBox() { SkSafeUnref(fObj); }
-
-    ACT_AS_PTR(fObj);
-
-private:
-    T* fObj;
-};
-
 // An Optional doesn't own the pointer's memory, but may need to destroy non-POD data.
 template <typename T>
 class Optional : SkNoncopyable {
 public:
     Optional() : fPtr(nullptr) {}
     Optional(T* ptr) : fPtr(ptr) {}
     Optional(Optional&& o) : fPtr(o.fPtr) {
         o.fPtr = nullptr;
     }
     ~Optional() { if (fPtr) fPtr->~T(); }
@@ skipping 66 matching lines @@
 
 RECORD(NoOp, 0);
 RECORD(Restore, 0,
         SkIRect devBounds;
         TypedMatrix matrix);
 RECORD(Save, 0);
 
 RECORD(SaveLayer, 0,
        Optional<SkRect> bounds;
        Optional<SkPaint> paint;
-       RefBox<const SkImageFilter> backdrop;
+       sk_sp<const SkImageFilter> backdrop;
        SkCanvas::SaveLayerFlags saveLayerFlags);
 
 RECORD(SetMatrix, 0,
         TypedMatrix matrix);
 RECORD(Concat, 0,
         TypedMatrix matrix);
 
 RECORD(TranslateZ, 0, SkScalar z);
 
 struct RegionOpAndAA {
@@ skipping 25 matching lines @@
 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;
-        RefBox<const SkImage> image;
+        sk_sp<const SkImage> image;
         SkScalar left;
         SkScalar top);
 RECORD(DrawImageRect, kDraw_Tag|kHasImage_Tag,
         Optional<SkPaint> paint;
-        RefBox<const SkImage> image;
+        sk_sp<const SkImage> image;
         Optional<SkRect> src;
         SkRect dst;
         SkCanvas::SrcRectConstraint constraint);
 RECORD(DrawImageNine, kDraw_Tag|kHasImage_Tag,
         Optional<SkPaint> paint;
-        RefBox<const SkImage> image;
+        sk_sp<const SkImage> image;
         SkIRect center;
         SkRect dst);
 RECORD(DrawOval, kDraw_Tag,
         SkPaint paint;
         SkRect oval);
 RECORD(DrawPaint, kDraw_Tag,
         SkPaint paint);
 RECORD(DrawPath, kDraw_Tag,
         SkPaint paint;
         PreCachedPath path);
 RECORD(DrawPicture, kDraw_Tag,
         Optional<SkPaint> paint;
-        RefBox<const SkPicture> picture;
+        sk_sp<const SkPicture> picture;
         TypedMatrix matrix);
 RECORD(DrawShadowedPicture, kDraw_Tag,
         Optional<SkPaint> paint;
-        RefBox<const SkPicture> picture;
+        sk_sp<const SkPicture> picture;
         TypedMatrix matrix);
 RECORD(DrawPoints, kDraw_Tag,
         SkPaint paint;
         SkCanvas::PointMode mode;
         unsigned count;
         SkPoint* pts);
 RECORD(DrawPosText, kDraw_Tag|kHasText_Tag,
         SkPaint paint;
         PODArray<char> text;
         size_t byteLength;
@@ skipping 11 matching lines @@
         SkPaint paint;
         SkRect rect);
 RECORD(DrawText, kDraw_Tag|kHasText_Tag,
         SkPaint paint;
         PODArray<char> text;
         size_t byteLength;
         SkScalar x;
         SkScalar y);
 RECORD(DrawTextBlob, kDraw_Tag|kHasText_Tag,
         SkPaint paint;
-        RefBox<const SkTextBlob> blob;
+        sk_sp<const SkTextBlob> blob;
         SkScalar x;
         SkScalar y);
 RECORD(DrawTextOnPath, kDraw_Tag|kHasText_Tag,
         SkPaint paint;
         PODArray<char> text;
         size_t byteLength;
         PreCachedPath path;
         TypedMatrix matrix);
 RECORD(DrawTextRSXform, kDraw_Tag|kHasText_Tag,
         SkPaint paint;
         PODArray<char> text;
         size_t byteLength;
         PODArray<SkRSXform> xforms;
         Optional<SkRect> cull);
 RECORD(DrawPatch, kDraw_Tag,
         SkPaint paint;
         PODArray<SkPoint> cubics;
         PODArray<SkColor> colors;
         PODArray<SkPoint> texCoords;
-        RefBox<SkXfermode> xmode);
+        sk_sp<SkXfermode> xmode);
 RECORD(DrawAtlas, kDraw_Tag|kHasImage_Tag,
         Optional<SkPaint> paint;
-        RefBox<const SkImage> atlas;
+        sk_sp<const SkImage> atlas;
         PODArray<SkRSXform> xforms;
         PODArray<SkRect> texs;
         PODArray<SkColor> colors;
         int count;
         SkXfermode::Mode mode;
         Optional<SkRect> cull);
 RECORD(DrawVertices, kDraw_Tag,
         SkPaint paint;
         SkCanvas::VertexMode vmode;
         int vertexCount;
         PODArray<SkPoint> vertices;
         PODArray<SkPoint> texs;
         PODArray<SkColor> colors;
-        RefBox<SkXfermode> xmode;
+        sk_sp<SkXfermode> xmode;
         PODArray<uint16_t> indices;
         int indexCount);
 RECORD(DrawAnnotation, 0,
        SkRect rect;
        SkString key;
-       RefBox<SkData> value);
+       sk_sp<SkData> value);
 #undef RECORD
 
 }  // namespace SkRecords
 
 #endif//SkRecords_DEFINED