diff options
author | bungeman <bungeman@google.com> | 2016-05-12 10:09:30 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-12 10:09:31 -0700 |
commit | 13b9c95295f4c5732e34574789e721a6bc08f7b4 (patch) | |
tree | c3ef0aa2af9890c03cb79968f32166af39fba9ba /src/core/SkPictureData.cpp | |
parent | 40d21de8b6620d724f34bdc85af1dcb593d33fe0 (diff) |
Move SkTypeface to sk_sp.
Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1933393002
Review-Url: https://codereview.chromium.org/1933393002
Diffstat (limited to 'src/core/SkPictureData.cpp')
-rw-r--r-- | src/core/SkPictureData.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkPictureData.cpp b/src/core/SkPictureData.cpp index ed32c6c029..873c0c4a1d 100644 --- a/src/core/SkPictureData.cpp +++ b/src/core/SkPictureData.cpp @@ -405,13 +405,13 @@ bool SkPictureData::parseStreamTag(SkStream* stream, const int count = SkToInt(size); fTFPlayback.setCount(count); for (int i = 0; i < count; i++) { - SkAutoTUnref<SkTypeface> tf(SkTypeface::Deserialize(stream)); + sk_sp<SkTypeface> tf(SkTypeface::MakeDeserialize(stream)); if (!tf.get()) { // failed to deserialize // fTFPlayback asserts it never has a null, so we plop in // the default here. - tf.reset(SkTypeface::RefDefault()); + tf = SkTypeface::MakeDefault(); } - fTFPlayback.set(i, tf); + fTFPlayback.set(i, tf.get()); } } break; case SK_PICT_PICTURE_TAG: { |