diff options
author | Ben Wagner <bungeman@google.com> | 2018-07-12 13:30:47 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-12 20:59:20 +0000 |
commit | 9ec70c6bd3dfe6338fbbae9c0447a5cbae770a75 (patch) | |
tree | fe9dcd75fcc80ce6c3d52a6d18cf8639b8aed485 /src/gpu/GrRenderTarget.cpp | |
parent | c434ade20eba4a62c450b7ce33a89966fac9df62 (diff) |
Remove SkSafeSetNull.
Update all users to sk_sp.
Change-Id: I6453b9456b9a8f9e2b756381797f1382ef9e6561
Reviewed-on: https://skia-review.googlesource.com/141052
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'src/gpu/GrRenderTarget.cpp')
-rw-r--r-- | src/gpu/GrRenderTarget.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gpu/GrRenderTarget.cpp b/src/gpu/GrRenderTarget.cpp index c39723507a..00b4d29ffc 100644 --- a/src/gpu/GrRenderTarget.cpp +++ b/src/gpu/GrRenderTarget.cpp @@ -29,6 +29,8 @@ GrRenderTarget::GrRenderTarget(GrGpu* gpu, const GrSurfaceDesc& desc, fResolveRect = SkRectPriv::MakeILargestInverted(); } +GrRenderTarget::~GrRenderTarget() = default; + void GrRenderTarget::flagAsNeedingResolve(const SkIRect* rect) { if (kCanResolve_ResolveType == getResolveType()) { if (rect) { @@ -58,13 +60,13 @@ void GrRenderTarget::flagAsResolved() { } void GrRenderTarget::onRelease() { - SkSafeSetNull(fStencilAttachment); + fStencilAttachment = nullptr; INHERITED::onRelease(); } void GrRenderTarget::onAbandon() { - SkSafeSetNull(fStencilAttachment); + fStencilAttachment = nullptr; INHERITED::onAbandon(); } @@ -77,9 +79,9 @@ bool GrRenderTargetPriv::attachStencilAttachment(sk_sp<GrStencilAttachment> sten // we're not actually adding one. return true; } - fRenderTarget->fStencilAttachment = stencil.release(); + fRenderTarget->fStencilAttachment = std::move(stencil); if (!fRenderTarget->completeStencilAttachment()) { - SkSafeSetNull(fRenderTarget->fStencilAttachment); + fRenderTarget->fStencilAttachment = nullptr; return false; } return true; |