change drawPicture in SkRecord to just ref the picture

src/core/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
 
 #include "SkCanvas.h"
+#include "SkPicture.h"
+
+class SkPictureBox {
+public:
+    SkPictureBox(const SkPicture* obj) : fObj(SkRef(obj)) {}
+    SkPictureBox(const SkPictureBox& src) : fObj(SkRef(src.fObj)) {}
+    ~SkPictureBox() { fObj->unref(); }
+
+    SkPictureBox& operator=(const SkPictureBox& src) {
+        SkRefCnt_SafeAssign(fObj, src.fObj);
+        return *this;
+    }
+
+    operator const SkPicture*() const { return fObj; }
+
+private:
+    const SkPicture* fObj;

[mtklein, 2014/08/07 18:19:27]

SkAutoTUnref<const SkPicture> ?

[reed1, 2014/08/07 19:10:52]

Possibly, but I think the Box semantics are different enough from autounref that
it may not make things clearer.

both constructors still have to manually call ref()
operator= would still have to be custom (to ref the new value)

+};
 
 namespace SkRecords {
 
 // A list of all the types of canvas calls we can record.
 // Each of these is reified into a struct below.
 //
 // (We're using the macro-of-macro trick here to do several different things with the same list.)
 //
 // We leave this SK_RECORD_TYPES macro defined for use by code that wants to operate on SkRecords
 // types polymorphically.  (See SkRecord::Record::{visit,mutate} for an example.)
@@ skipping 17 matching lines @@
     M(Clear)                                                        \
     M(DrawBitmap)                                                   \
     M(DrawBitmapMatrix)                                             \
     M(DrawBitmapNine)                                               \
     M(DrawBitmapRectToRect)                                         \
     M(DrawDRRect)                                                   \
     M(DrawOval)                                                     \
     M(DrawPaint)                                                    \
     M(DrawPath)                                                     \
     M(DrawPatch)                                                    \
+    M(DrawPicture)                                                  \
     M(DrawPoints)                                                   \
     M(DrawPosText)                                                  \
     M(DrawPosTextH)                                                 \
     M(DrawRRect)                                                    \
     M(DrawRect)                                                     \
     M(DrawSprite)                                                   \
     M(DrawText)                                                     \
     M(DrawTextOnPath)                                               \
     M(DrawVertices)                                                 \
     M(BoundedDrawPosTextH)    /*From SkRecordBoundDrawPosTextH*/
@@ skipping 153 matching lines @@
 RECORD5(DrawBitmapRectToRect, Optional<SkPaint>, paint,
                               ImmutableBitmap, bitmap,
                               Optional<SkRect>, src,
                               SkRect, dst,
                               SkCanvas::DrawBitmapRectFlags, flags);
 RECORD3(DrawDRRect, SkPaint, paint, SkRRect, outer, SkRRect, inner);
 RECORD2(DrawOval, SkPaint, paint, SkRect, oval);
 RECORD1(DrawPaint, SkPaint, paint);
 RECORD2(DrawPath, SkPaint, paint, SkPath, path);
 RECORD2(DrawPatch, SkPaint, paint, SkPatch, patch);
+RECORD1(DrawPicture, SkPictureBox, picture);
 RECORD4(DrawPoints, SkPaint, paint, SkCanvas::PointMode, mode, size_t, count, SkPoint*, pts);
 RECORD4(DrawPosText, SkPaint, paint,
                      PODArray<char>, text,
                      size_t, byteLength,
                      PODArray<SkPoint>, pos);
 RECORD5(DrawPosTextH, SkPaint, paint,
                       PODArray<char>, text,
                       size_t, byteLength,
                       PODArray<SkScalar>, xpos,
                       SkScalar, y);
@@ skipping 52 matching lines @@
 #undef RECORD0
 #undef RECORD1
 #undef RECORD2
 #undef RECORD3
 #undef RECORD4
 #undef RECORD5
 
 }  // namespace SkRecords
 
 #endif//SkRecords_DEFINED