diff options
| author |  Matt Sarett <msarett@google.com> | 2017-01-09 15:59:17 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-09 21:40:27 +0000 |
| commit | f9436b8235620fd9baa5d341e37eedf9c306f68c (patch) | |
| tree | 3feb7a32442a46462abb46dcf48159d6a6133aa1 /include | |
| parent | 6294d3f79ecfb9355ce6d65305e28c5d60f4d05f (diff) | |
Allow constrained and unconstrained picture-images
BUG=skia:
Change-Id: Id9b7b2c82c634fec50f9a57f4b59ce0c02e0706a
Reviewed-on: https://skia-review.googlesource.com/6818
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkImage.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h index 7d282daecf..9ecfb272a6 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -159,15 +159,17 @@ public: kF16, }; -#ifdef SK_USE_LEGACY_MAKE_PICTURE_API + /** + * Create a new image from the specified picture. + * This SkImage has no defined BitDepth or SkColorSpace, it is a flexible container for + * draw commands. + */ static sk_sp<SkImage> MakeFromPicture(sk_sp<SkPicture> picture, const SkISize& dimensions, const SkMatrix* matrix, const SkPaint* paint); -#endif /** * Create a new image from the specified picture. - * Creating an SkImage from an SkPicture requires snapping the picture to a particular - * BitDepth and SkColorSpace. + * On creation of the SkImage, snap the SkPicture to a particular BitDepth and SkColorSpace. */ static sk_sp<SkImage> MakeFromPicture(sk_sp<SkPicture>, const SkISize& dimensions, const SkMatrix*, const SkPaint*, BitDepth, |