From 3354969a4a4adcea159f3a0b01ad0a7c04fc9115 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 1 May 2017 21:31:32 +0000 Subject: Revert "SaveLayerRec::fClipMask -> raw pointer" This reverts commit a6b72cb5729306fdd676d739c1e2c53afa0786a7. Reason for revert: red bots Original change's description: > SaveLayerRec::fClipMask -> raw pointer > > Use raw pointers for optional clip mask plumbing, to match the backdrop > API. > > Change-Id: I7eb0ee5896faf34cc05789ba0703f35a4ab6a4f2 > Reviewed-on: https://skia-review.googlesource.com/14901 > Reviewed-by: Mike Reed > Commit-Queue: Florin Malita > TBR=fmalita@chromium.org,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I4387620cdc3410018af9cef221e5cf8d09015380 Reviewed-on: https://skia-review.googlesource.com/14955 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- src/pipe/SkPipeCanvas.cpp | 2 +- src/pipe/SkPipeReader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pipe') diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp index 7b665d9968..91e74eeca5 100644 --- a/src/pipe/SkPipeCanvas.cpp +++ b/src/pipe/SkPipeCanvas.cpp @@ -258,7 +258,7 @@ SkCanvas::SaveLayerStrategy SkPipeCanvas::getSaveLayerStrategy(const SaveLayerRe writer.writeFlattenable(rec.fBackdrop); } if (rec.fClipMask) { - writer.writeImage(rec.fClipMask); + writer.writeImage(rec.fClipMask.get()); } if (rec.fClipMatrix) { writer.writeMatrix(*rec.fClipMatrix); diff --git a/src/pipe/SkPipeReader.cpp b/src/pipe/SkPipeReader.cpp index 07b360c28c..73ef970c1b 100644 --- a/src/pipe/SkPipeReader.cpp +++ b/src/pipe/SkPipeReader.cpp @@ -259,7 +259,7 @@ static void saveLayer_handler(SkPipeReader& reader, uint32_t packedVerb, SkCanva flags |= (1 << 31);//SkCanvas::kDontClipToLayer_PrivateSaveLayerFlag; } - canvas->saveLayer(SkCanvas::SaveLayerRec(bounds, paint, backdrop.get(), clipMask.get(), + canvas->saveLayer(SkCanvas::SaveLayerRec(bounds, paint, backdrop.get(), std::move(clipMask), (extra & kHasClipMatrix_SaveLayerMask) ? &clipMatrix : nullptr, flags)); } -- cgit v1.2.3