diff options
| author |  bungeman <bungeman@google.com> | 2016-09-16 06:24:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-16 06:24:20 -0700 |
| commit | f93d71122e4fcfcdc674a0163455990b13855f2f (patch) | |
| tree | b3713fad2da586bf997264247961c1a91453c383 /include/utils/mac | |
| parent | f560ef86813f712eff70feb9b00b70d0fe92c3cd (diff) | |
SkFontData to use smart pointers.
The SkFontData type is not exposed externally, so any method which uses
it can be updated to use smart pointers without affecting external
users. Updating this first will make updating the public API much
easier.
This also updates SkStreamAsset* SkStream::NewFromFile(const char*) to
std::unique_ptr<SkStreamAsset> SkStream::MakeFromFile(const char*). It
appears that no one outside Skia is currently using SkStream::NewfromFile
so this is a good time to update it as well.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2339273002
Committed: https://skia.googlesource.com/skia/+/d8c2476a8b1e1e1a1771b17e8dd4db8645914f8c
Review-Url: https://codereview.chromium.org/2339273002
Diffstat (limited to 'include/utils/mac')
| -rw-r--r-- | include/utils/mac/SkCGUtils.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/utils/mac/SkCGUtils.h b/include/utils/mac/SkCGUtils.h index 3d9aff4451..29df8b81a8 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 |