diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-05-01 21:31:32 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-01 21:31:40 +0000 |
| commit | 3354969a4a4adcea159f3a0b01ad0a7c04fc9115 (patch) | |
| tree | 13252cb3eb06b80d7a05f8063ac339e1847c84d5 /include | |
| parent | c59a38d12dce287427f3d3fe1d4b3ad8052cda35 (diff) | |
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 <reed@google.com>
> Commit-Queue: Florin Malita <fmalita@chromium.org>
>
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 <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkCanvas.h | 6 | ||||
| -rw-r--r-- | include/private/SkRecords.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 06e26208ab..197fad8919 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -336,10 +336,8 @@ public: , fBackdrop(backdrop) , fSaveLayerFlags(saveLayerFlags) {} - - // EXPERIMENTAL: not ready for general use. SaveLayerRec(const SkRect* bounds, const SkPaint* paint, const SkImageFilter* backdrop, - const SkImage* clipMask, const SkMatrix* clipMatrix, + sk_sp<SkImage> clipMask, const SkMatrix* clipMatrix, SaveLayerFlags saveLayerFlags) : fBounds(bounds) , fPaint(paint) @@ -352,7 +350,7 @@ public: const SkRect* fBounds = nullptr; // optional const SkPaint* fPaint = nullptr; // optional const SkImageFilter* fBackdrop = nullptr; // optional - const SkImage* fClipMask = nullptr; // optional + sk_sp<SkImage> fClipMask; // 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 4d7b217f71..f1886f3e70 100644 --- a/include/private/SkRecords.h +++ b/include/private/SkRecords.h @@ -180,7 +180,7 @@ RECORD(SaveLayer, kHasPaint_Tag, Optional<SkRect> bounds; Optional<SkPaint> paint; sk_sp<const SkImageFilter> backdrop; - sk_sp<const SkImage> clipMask; + sk_sp<SkImage> clipMask; Optional<SkMatrix> clipMatrix; SkCanvas::SaveLayerFlags saveLayerFlags); |