diff options
author | 2016-03-17 10:51:11 -0700 | |
---|---|---|
committer | 2016-03-17 10:51:11 -0700 | |
commit | 9ce9d6772df650ceb0511f275e1a83dffa78ff72 (patch) | |
tree | 1c0d54a75945863947490ec45cccf7c30eaa2ca4 /src/image/SkSurface_Base.h | |
parent | 42d95a0afb26560586232961445ba36de387ca37 (diff) |
update callsites for Make image factories
not forced yet, as we still have the build-guard. waiting on chrome CL
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810813003
TBR=
Review URL: https://codereview.chromium.org/1810813003
Diffstat (limited to 'src/image/SkSurface_Base.h')
-rw-r--r-- | src/image/SkSurface_Base.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/image/SkSurface_Base.h b/src/image/SkSurface_Base.h index 0519a9b3c0..96dd305960 100644 --- a/src/image/SkSurface_Base.h +++ b/src/image/SkSurface_Base.h @@ -81,7 +81,7 @@ public: virtual void onPrepareForExternalIO() {} inline SkCanvas* getCachedCanvas(); - inline SkImage* refCachedImage(SkBudgeted, ForceUnique); + inline sk_sp<SkImage> refCachedImage(SkBudgeted, ForceUnique); bool hasCachedImage() const { return fCachedImage != nullptr; } @@ -114,13 +114,13 @@ SkCanvas* SkSurface_Base::getCachedCanvas() { return fCachedCanvas; } -SkImage* SkSurface_Base::refCachedImage(SkBudgeted budgeted, ForceUnique unique) { +sk_sp<SkImage> SkSurface_Base::refCachedImage(SkBudgeted budgeted, ForceUnique unique) { SkImage* snap = fCachedImage; if (kYes_ForceUnique == unique && snap && !snap->unique()) { snap = nullptr; } if (snap) { - return SkRef(snap); + return sk_ref_sp(snap); } ForceCopyMode fcm = (kYes_ForceUnique == unique) ? kYes_ForceCopyMode : kNo_ForceCopyMode; @@ -130,7 +130,7 @@ SkImage* SkSurface_Base::refCachedImage(SkBudgeted budgeted, ForceUnique unique) fCachedImage = SkSafeRef(snap); } SkASSERT(!fCachedCanvas || fCachedCanvas->getSurfaceBase() == this); - return snap; + return sk_sp<SkImage>(snap); } #endif |