From b34ab04884f6219b93c1f143c83a1fc60fded40c Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 1 May 2017 21:34:14 +0000 Subject: 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 --- tests/RecordOptsTest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/RecordOptsTest.cpp') diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp index d34959af5d..cb80987211 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); -- cgit v1.2.3