| Index: include/utils/mac/SkCGUtils.h
|
| diff --git a/include/utils/mac/SkCGUtils.h b/include/utils/mac/SkCGUtils.h
|
| index 3d9aff44515facfe437ef8ae2ccc015ca1788705..29df8b81a889d4050ab5f59bea06b0054869c502 100644
|
| --- a/include/utils/mac/SkCGUtils.h
|
| +++ b/include/utils/mac/SkCGUtils.h
|
| @@ -23,7 +23,7 @@
|
|
|
| class SkBitmap;
|
| class SkData;
|
| -class SkStream;
|
| +class SkStreamRewindable;
|
|
|
| /**
|
| * Given a CGImage, allocate an SkBitmap and copy the image's pixels into it. If scaleToFit is not
|
| @@ -65,20 +65,12 @@ static inline CGImageRef SkCreateCGImageRef(const SkBitmap& bm) {
|
| void SkCGDrawBitmap(CGContextRef, const SkBitmap&, float x, float y);
|
|
|
| /**
|
| - * Create an SkBitmap drawing of the encoded PDF document, returning true on
|
| - * success. Deletes the stream when finished.
|
| - */
|
| -bool SkPDFDocumentToBitmap(SkStream* stream, SkBitmap* output);
|
| -
|
| -/**
|
| - * Return a provider that wraps the specified stream. It will become the only
|
| - * owner of the stream, so the caller must stop referring to the stream.
|
| - *
|
| + * Return a provider that wraps the specified stream.
|
| * When the provider is finally deleted, it will delete the stream.
|
| */
|
| -CGDataProviderRef SkCreateDataProviderFromStream(SkStream*);
|
| +CGDataProviderRef SkCreateDataProviderFromStream(std::unique_ptr<SkStreamRewindable>);
|
|
|
| -CGDataProviderRef SkCreateDataProviderFromData(SkData*);
|
| +CGDataProviderRef SkCreateDataProviderFromData(sk_sp<SkData>);
|
|
|
| #endif // defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
|
| #endif // SkCGUtils_DEFINED
|
|
|