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

Unified Diff: gm/mixedtextblobs.cpp

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: gm/mixedtextblobs.cpp
diff --git a/gm/mixedtextblobs.cpp b/gm/mixedtextblobs.cpp
index 9a9bded1db097775791cfd9580528e97e71c4a0e..e66e73caf3f0915e95ad59ed8a5d7cb026cac72e 100644
--- a/gm/mixedtextblobs.cpp
+++ b/gm/mixedtextblobs.cpp
@@ -39,9 +39,9 @@
protected:
void onOnceBeforeDraw() override {
- fEmojiTypeface = sk_tool_utils::emoji_typeface();
+ sk_tool_utils::emoji_typeface(&fEmojiTypeface);
fEmojiText = sk_tool_utils::emoji_sample_text();
- fReallyBigATypeface = MakeResourceAsTypeface("/fonts/ReallyBigA.ttf");
+ fReallyBigATypeface.reset(GetResourceAsTypeface("/fonts/ReallyBigA.ttf"));
SkTextBlobBuilder builder;
@@ -150,8 +150,8 @@
}
private:
- sk_sp<SkTypeface> fEmojiTypeface;
- sk_sp<SkTypeface> fReallyBigATypeface;
+ SkAutoTUnref<SkTypeface> fEmojiTypeface;
+ SkAutoTUnref<SkTypeface> fReallyBigATypeface;
const char* fEmojiText;
SkAutoTUnref<const SkTextBlob> fBlob;
« no previous file with comments | « gm/gammatext.cpp ('k') | gm/pdf_never_embed.cpp » ('j') | src/ports/SkFontMgr_android.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698