diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-10 16:18:46 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-10 16:18:46 -0800 |
| commit | e683c56115a210b5993df9294260bb147b408bfa (patch) | |
| tree | a544048de0c2e3e693953cc1e5319fff108a68ae /src/image/SkImagePriv.h | |
| parent | dd67e3d1b3c1e9f400f1ddd37e9e52c8a2952eec (diff) | |
Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001 of https://codereview.chromium.org/1778393002/ )
Reason for revert:
Experimental revert to try to clear up ASAN failures
Original issue's description:
> add Make variations to return SkImage by sk_sp
>
> some internal call-sites update, but not. Will follow-up in future to complete that.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1778393002
>
> Committed: https://skia.googlesource.com/skia/+/bd73ffb83022f1f6b1997e2a91c049949e88a8a2
TBR=fmalita@chromium.org,bsalomon@google.com,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1783063002
Diffstat (limited to 'src/image/SkImagePriv.h')
| -rw-r--r-- | src/image/SkImagePriv.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/image/SkImagePriv.h b/src/image/SkImagePriv.h index a625472eaa..acd0beb475 100644 --- a/src/image/SkImagePriv.h +++ b/src/image/SkImagePriv.h @@ -12,9 +12,9 @@ #include "SkSurface.h" // Call this if you explicitly want to use/share this pixelRef in the image -extern sk_sp<SkImage> SkMakeImageFromPixelRef(const SkImageInfo&, SkPixelRef*, - const SkIPoint& pixelRefOrigin, - size_t rowBytes); +extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*, + const SkIPoint& pixelRefOrigin, + size_t rowBytes); /** * Examines the bitmap to decide if it can share the existing pixelRef, or @@ -38,8 +38,7 @@ enum ForceCopyMode { kNo_ForceCopyMode, kYes_ForceCopyMode, // must copy the pixels even if the bitmap is immutable }; -extern sk_sp<SkImage> SkMakeImageFromRasterBitmap(const SkBitmap&, - ForceCopyMode = kNo_ForceCopyMode); +extern SkImage* SkNewImageFromRasterBitmap(const SkBitmap&, ForceCopyMode = kNo_ForceCopyMode); // Given an image created from SkNewImageFromBitmap, return its pixelref. This // may be called to see if the surface and the image share the same pixelref, |