diff options
| author |  bungeman <bungeman@google.com> | 2016-09-15 10:57:38 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-15 10:57:39 -0700 |
| commit | 606add3dfb2f6d1dc3ee4921876e7c9fa01643f9 (patch) | |
| tree | f358bd464a80b6739601ef2c653ce78c532f3a7c /include/utils | |
| parent | a846c7223c531a634a549e7e6ed7d28eeec95bef (diff) | |
Revert of SkFontData to use smart pointers. (patchset #3 id:40001 of https://codereview.chromium.org/2339273002/ )
Reason for revert:
Killing Mac
Original issue's description:
> 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
TBR=mtklein@chromium.org,halcanary@google.com,mtklein@google.com,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2343933002
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/mac/SkCGUtils.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/utils/mac/SkCGUtils.h b/include/utils/mac/SkCGUtils.h index a8f86de35b..3d9aff4451 100644 --- a/include/utils/mac/SkCGUtils.h +++ b/include/utils/mac/SkCGUtils.h @@ -65,12 +65,20 @@ static inline CGImageRef SkCreateCGImageRef(const SkBitmap& bm) { void SkCGDrawBitmap(CGContextRef, const SkBitmap&, float x, float y); /** - * Return a provider that wraps the specified stream. + * 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. + * * When the provider is finally deleted, it will delete the stream. */ -CGDataProviderRef SkCreateDataProviderFromStream(std::unique_ptr<SkStream>); +CGDataProviderRef SkCreateDataProviderFromStream(SkStream*); -CGDataProviderRef SkCreateDataProviderFromData(sk_sp<SkData>); +CGDataProviderRef SkCreateDataProviderFromData(SkData*); #endif // defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) #endif // SkCGUtils_DEFINED |