Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: src/animator/SkPaintPart.h

Issue 1974783002: Revert of Move SkTypeface to sk_sp. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/animator/SkPaintPart.h
diff --git a/src/animator/SkPaintPart.h b/src/animator/SkPaintPart.h
index 5d94f049e86438654d0557dc483bcf7abe4461a2..a7e28ed3e27c40aa9eccfac5d15341297bb00c08 100644
--- a/src/animator/SkPaintPart.h
+++ b/src/animator/SkPaintPart.h
@@ -62,7 +62,8 @@
#ifdef SK_DUMP_ENABLED
void dump(SkAnimateMaker *) override;
#endif
- sk_sp<SkTypeface> getTypeface() { return SkTypeface::MakeFromName(fontName.c_str(), style); }
+ SkTypeface* getTypeface() {
+ return SkTypeface::CreateFromName(fontName.c_str(), style); }
protected:
bool add() override;
SkString fontName;

Powered by Google App Engine
This is Rietveld 408576698