From 13b9c95295f4c5732e34574789e721a6bc08f7b4 Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 12 May 2016 10:09:30 -0700 Subject: 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 --- samplecode/SampleFontScalerTest.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'samplecode/SampleFontScalerTest.cpp') diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp index ce3b81ee8a..72371ed807 100644 --- a/samplecode/SampleFontScalerTest.cpp +++ b/samplecode/SampleFontScalerTest.cpp @@ -36,23 +36,16 @@ static const struct { static const int gFaceCount = SK_ARRAY_COUNT(gFaces); class FontScalerTestView : public SampleView { - SkTypeface* fFaces[gFaceCount]; + sk_sp fFaces[gFaceCount]; public: FontScalerTestView() { for (int i = 0; i < gFaceCount; i++) { - fFaces[i] = SkTypeface::CreateFromName(gFaces[i].fName, - gFaces[i].fStyle); + fFaces[i] = SkTypeface::MakeFromName(gFaces[i].fName, gFaces[i].fStyle); } // this->setBGColor(0xFFDDDDDD); } - virtual ~FontScalerTestView() { - for (int i = 0; i < gFaceCount; i++) { - SkSafeUnref(fFaces[i]); - } - } - protected: // overrides from SkEventSink virtual bool onQuery(SkEvent* evt) { @@ -92,7 +85,7 @@ protected: // paint.setSubpixelText(true); paint.setAntiAlias(true); paint.setLCDRenderText(true); - SkSafeUnref(paint.setTypeface(SkTypeface::CreateFromName("Times Roman", SkTypeface::kNormal))); + paint.setTypeface(SkTypeface::MakeFromName("Times Roman", SkTypeface::kNormal)); // const char* text = "abcdefghijklmnopqrstuvwxyz"; const char* text = "Hamburgefons ooo mmm"; -- cgit v1.2.3