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 /src/animator/SkAnimateMaker.cpp | |
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 'src/animator/SkAnimateMaker.cpp')
-rw-r--r-- | src/animator/SkAnimateMaker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/animator/SkAnimateMaker.cpp b/src/animator/SkAnimateMaker.cpp index 066f877a9b..5186da04d8 100644 --- a/src/animator/SkAnimateMaker.cpp +++ b/src/animator/SkAnimateMaker.cpp @@ -99,9 +99,9 @@ bool SkAnimateMaker::decodeURI(const char uri[]) { // SkDebugf("animator decode %s\n", uri); // SkStream* stream = SkStream::GetURIStream(fPrefix.c_str(), uri); - std::unique_ptr<SkStream> stream = SkStream::MakeFromFile(uri); - if (stream) { - bool success = decodeStream(stream.get()); + SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(uri)); + if (stream.get()) { + bool success = decodeStream(stream); if (hasError() && fError.hasNoun() == false) fError.setNoun(uri); return success; |