From b34ab04884f6219b93c1f143c83a1fc60fded40c Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 1 May 2017 21:34:14 +0000 Subject: [PATCH] Revert "Revert "SaveLayerRec::fClipMask -> raw pointer"" This reverts commit 3354969a4a4adcea159f3a0b01ad0a7c04fc9115. Reason for revert: not the problem? Original change's description: > 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 > TBR=mtklein@chromium.org,reviews@skia.org,fmalita@chromium.org,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I6dde9e0441928f7a7423139a5c39f520f892f4b5 Reviewed-on: https://skia-review.googlesource.com/14958 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- gm/savelayer.cpp | 4 ++-- include/core/SkCanvas.h | 6 ++++-- include/private/SkRecords.h | 2 +- src/core/SkCanvas.cpp | 4 ++-- src/core/SkColorSpaceXformCanvas.cpp | 4 ++-- src/core/SkLiteDL.cpp | 12 ++++++------ src/core/SkLiteDL.h | 2 +- src/core/SkPicturePlayback.cpp | 2 +- src/core/SkPictureRecord.cpp | 2 +- src/core/SkRecordDraw.cpp | 2 +- src/core/SkRecorder.cpp | 2 +- src/pipe/SkPipeCanvas.cpp | 2 +- src/pipe/SkPipeReader.cpp | 2 +- tests/RecordOptsTest.cpp | 3 ++- 14 files changed, 26 insertions(+), 23 deletions(-) diff --git a/gm/savelayer.cpp b/gm/savelayer.cpp index 245785e..dd7ff7b 100644 --- a/gm/savelayer.cpp +++ b/gm/savelayer.cpp @@ -210,8 +210,8 @@ DEF_SIMPLE_GM(savelayer_clipmask, canvas, 1200, 1200) { rec.fPaint = &layerPaint; for (const auto& maskMaker : kMaskMakers) { - maskMaker(kSize); - rec.fClipMask = maskMaker(kSize); + sk_sp mask = maskMaker(kSize); + rec.fClipMask = mask.get(); canvas->save(); for (const auto cfg : kConfigs) { diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 197fad8..06e2620 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -336,8 +336,10 @@ public: , fBackdrop(backdrop) , fSaveLayerFlags(saveLayerFlags) {} + + // EXPERIMENTAL: not ready for general use. SaveLayerRec(const SkRect* bounds, const SkPaint* paint, const SkImageFilter* backdrop, - sk_sp clipMask, const SkMatrix* clipMatrix, + const SkImage* clipMask, const SkMatrix* clipMatrix, SaveLayerFlags saveLayerFlags) : fBounds(bounds) , fPaint(paint) @@ -350,7 +352,7 @@ public: const SkRect* fBounds = nullptr; // optional const SkPaint* fPaint = nullptr; // optional const SkImageFilter* fBackdrop = nullptr; // optional - sk_sp fClipMask; // optional + const SkImage* fClipMask = nullptr; // optional const SkMatrix* fClipMatrix = nullptr; // optional -- only used with fClipMask SaveLayerFlags fSaveLayerFlags = 0; }; diff --git a/include/private/SkRecords.h b/include/private/SkRecords.h index f1886f3..4d7b217 100644 --- a/include/private/SkRecords.h +++ b/include/private/SkRecords.h @@ -180,7 +180,7 @@ RECORD(SaveLayer, kHasPaint_Tag, Optional bounds; Optional paint; sk_sp backdrop; - sk_sp clipMask; + sk_sp clipMask; Optional clipMatrix; SkCanvas::SaveLayerFlags saveLayerFlags); diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index c7e1d6e..c09e6cb 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -257,12 +257,12 @@ struct DeviceCM { SkMatrix fClipMatrix; DeviceCM(sk_sp device, const SkPaint* paint, const SkMatrix& stashed, - sk_sp clipImage, const SkMatrix* clipMatrix) + const SkImage* clipImage, const SkMatrix* clipMatrix) : fNext(nullptr) , fDevice(std::move(device)) , fPaint(paint ? skstd::make_unique(*paint) : nullptr) , fStashedMatrix(stashed) - , fClipImage(std::move(clipImage)) + , fClipImage(sk_ref_sp(const_cast(clipImage))) , fClipMatrix(clipMatrix ? *clipMatrix : SkMatrix::I()) {} diff --git a/src/core/SkColorSpaceXformCanvas.cpp b/src/core/SkColorSpaceXformCanvas.cpp index b4dd5bb..2d62458 100644 --- a/src/core/SkColorSpaceXformCanvas.cpp +++ b/src/core/SkColorSpaceXformCanvas.cpp @@ -229,12 +229,12 @@ public: SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec& rec) override { sk_sp backdrop = rec.fBackdrop ? fXformer->apply(rec.fBackdrop) : nullptr; - sk_sp clipMask = rec.fClipMask ? fXformer->apply(rec.fClipMask.get()) : nullptr; + sk_sp clipMask = rec.fClipMask ? fXformer->apply(rec.fClipMask) : nullptr; fTarget->saveLayer({ rec.fBounds, MaybePaint(rec.fPaint, fXformer.get()), backdrop.get(), - std::move(clipMask), + clipMask.get(), rec.fClipMatrix, rec.fSaveLayerFlags, }); diff --git a/src/core/SkLiteDL.cpp b/src/core/SkLiteDL.cpp index f840607..71cbf68 100644 --- a/src/core/SkLiteDL.cpp +++ b/src/core/SkLiteDL.cpp @@ -91,23 +91,23 @@ namespace { struct SaveLayer final : Op { static const auto kType = Type::SaveLayer; SaveLayer(const SkRect* bounds, const SkPaint* paint, - const SkImageFilter* backdrop, sk_sp clipMask, + const SkImageFilter* backdrop, const SkImage* clipMask, const SkMatrix* clipMatrix, SkCanvas::SaveLayerFlags flags) { if (bounds) { this->bounds = *bounds; } if (paint) { this->paint = *paint; } this->backdrop = sk_ref_sp(backdrop); - this->clipMask = std::move(clipMask); + this->clipMask = sk_ref_sp(clipMask); this->clipMatrix = clipMatrix ? *clipMatrix : SkMatrix::I(); this->flags = flags; } SkRect bounds = kUnset; SkPaint paint; sk_sp backdrop; - sk_sp clipMask; + sk_sp clipMask; SkMatrix clipMatrix; SkCanvas::SaveLayerFlags flags; void draw(SkCanvas* c, const SkMatrix&) const { - c->saveLayer({ maybe_unset(bounds), &paint, backdrop.get(), clipMask, + c->saveLayer({ maybe_unset(bounds), &paint, backdrop.get(), clipMask.get(), clipMatrix.isIdentity() ? nullptr : &clipMatrix, flags }); } }; @@ -550,9 +550,9 @@ void SkLiteDL::setDrawFilter(SkDrawFilter* df) { void SkLiteDL:: save() { this->push (0); } void SkLiteDL::restore() { this->push(0); } void SkLiteDL::saveLayer(const SkRect* bounds, const SkPaint* paint, - const SkImageFilter* backdrop, sk_sp clipMask, + const SkImageFilter* backdrop, const SkImage* clipMask, const SkMatrix* clipMatrix, SkCanvas::SaveLayerFlags flags) { - this->push(0, bounds, paint, backdrop, std::move(clipMask), clipMatrix, flags); + this->push(0, bounds, paint, backdrop, clipMask, clipMatrix, flags); } void SkLiteDL:: concat(const SkMatrix& matrix) { this->push (0, matrix); } diff --git a/src/core/SkLiteDL.h b/src/core/SkLiteDL.h index 5219cd0..f8e7910 100644 --- a/src/core/SkLiteDL.h +++ b/src/core/SkLiteDL.h @@ -29,7 +29,7 @@ public: #endif void save(); - void saveLayer(const SkRect*, const SkPaint*, const SkImageFilter*, sk_sp, + void saveLayer(const SkRect*, const SkPaint*, const SkImageFilter*, const SkImage*, const SkMatrix*, SkCanvas::SaveLayerFlags); void restore(); diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp index 84228d0..3af7909 100644 --- a/src/core/SkPicturePlayback.cpp +++ b/src/core/SkPicturePlayback.cpp @@ -744,7 +744,7 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader, rec.fSaveLayerFlags = reader->readInt(); } if (flatFlags & SAVELAYERREC_HAS_CLIPMASK) { - rec.fClipMask = sk_ref_sp(const_cast(fPictureData->getImage(reader))); + rec.fClipMask = fPictureData->getImage(reader); } if (flatFlags & SAVELAYERREC_HAS_CLIPMATRIX) { reader->readMatrix(&clipMatrix); diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp index ea4273f..608c6b3 100644 --- a/src/core/SkPictureRecord.cpp +++ b/src/core/SkPictureRecord.cpp @@ -125,7 +125,7 @@ void SkPictureRecord::recordSaveLayer(const SaveLayerRec& rec) { this->addInt(rec.fSaveLayerFlags); } if (flatFlags & SAVELAYERREC_HAS_CLIPMASK) { - this->addImage(rec.fClipMask.get()); + this->addImage(rec.fClipMask); } if (flatFlags & SAVELAYERREC_HAS_CLIPMATRIX) { this->addMatrix(*rec.fClipMatrix); diff --git a/src/core/SkRecordDraw.cpp b/src/core/SkRecordDraw.cpp index 02c8c69..9e8d6fc 100644 --- a/src/core/SkRecordDraw.cpp +++ b/src/core/SkRecordDraw.cpp @@ -77,7 +77,7 @@ DRAW(Save, save()); DRAW(SaveLayer, saveLayer(SkCanvas::SaveLayerRec(r.bounds, r.paint, r.backdrop.get(), - r.clipMask, + r.clipMask.get(), r.clipMatrix, r.saveLayerFlags))); DRAW(SetMatrix, setMatrix(SkMatrix::Concat(fInitialCTM, r.matrix))); diff --git a/src/core/SkRecorder.cpp b/src/core/SkRecorder.cpp index c9d88fc..3fdc17d 100644 --- a/src/core/SkRecorder.cpp +++ b/src/core/SkRecorder.cpp @@ -366,7 +366,7 @@ SkCanvas::SaveLayerStrategy SkRecorder::getSaveLayerStrategy(const SaveLayerRec& APPEND(SaveLayer, this->copy(rec.fBounds) , this->copy(rec.fPaint) , sk_ref_sp(rec.fBackdrop) - , rec.fClipMask + , sk_ref_sp(rec.fClipMask) , this->copy(rec.fClipMatrix) , rec.fSaveLayerFlags); return SkCanvas::kNoLayer_SaveLayerStrategy; diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp index 91e74ee..7b665d9 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.get()); + writer.writeImage(rec.fClipMask); } if (rec.fClipMatrix) { writer.writeMatrix(*rec.fClipMatrix); diff --git a/src/pipe/SkPipeReader.cpp b/src/pipe/SkPipeReader.cpp index 73ef970..07b360c 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(), std::move(clipMask), + canvas->saveLayer(SkCanvas::SaveLayerRec(bounds, paint, backdrop.get(), clipMask.get(), (extra & kHasClipMatrix_SaveLayerMask) ? &clipMatrix : nullptr, flags)); } diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp index d34959a..cb80987 100644 --- a/tests/RecordOptsTest.cpp +++ b/tests/RecordOptsTest.cpp @@ -198,7 +198,8 @@ DEF_TEST(RecordOpts_NoopSaveLayerDrawRestore, r) { // saveLayer w/ clip mask should also NOT go away { sk_sp surface(SkSurface::MakeRasterN32Premul(10, 10)); - recorder.saveLayer({ nullptr, nullptr, nullptr, surface->makeImageSnapshot(), nullptr, 0}); + recorder.saveLayer({ nullptr, nullptr, nullptr, surface->makeImageSnapshot().get(), + nullptr, 0}); recorder.drawRect(draw, opaqueDrawPaint); recorder.restore(); assert_savelayer_draw_restore(r, &record, 21, false); -- 2.7.4