diff options
| author |  Florin Malita <fmalita@chromium.org> | 2017-05-01 12:17:12 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-01 21:26:01 +0000 |
| commit | a6b72cb5729306fdd676d739c1e2c53afa0786a7 (patch) | |
| tree | ba4a30663e7cb1cb926b4f4fe895eaebefbcfb21 /src/pipe | |
| parent | 5664e65eb1680a14eeaa6ca79ddf9e734518c822 (diff) | |
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 <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/pipe')
| -rw-r--r-- | src/pipe/SkPipeCanvas.cpp | 2 | ||||
| -rw-r--r-- | src/pipe/SkPipeReader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp index 91e74eeca5..7b665d9968 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 73ef970c1b..07b360c28c 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)); } |