Index: src/core/SkRecords.h |
diff --git a/src/core/SkRecords.h b/src/core/SkRecords.h |
index 347bc36276d055e313b06331f2adfb3348c6b40a..6aefd195c98fd022a51a48e34ce8f9f0092d6e95 100644 |
--- a/src/core/SkRecords.h |
+++ b/src/core/SkRecords.h |
@@ -14,17 +14,14 @@ |
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: |
+ SkPictureBox(const SkPictureBox&); |
+ SkPictureBox& operator=(const SkPictureBox&); |
+ |
const SkPicture* fObj; |
}; |
@@ -236,7 +233,7 @@ 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); |
+RECORD3(DrawPicture, Optional<SkPaint>, paint, SkPictureBox, picture, Optional<SkMatrix>, matrix); |
RECORD4(DrawPoints, SkPaint, paint, SkCanvas::PointMode, mode, size_t, count, SkPoint*, pts); |
RECORD4(DrawPosText, SkPaint, paint, |
PODArray<char>, text, |