From 6296da736fbf40aae881650c239420f64e576c3f Mon Sep 17 00:00:00 2001 From: bungeman Date: Wed, 11 May 2016 12:38:18 -0700 Subject: Move SkTypeface to sk_sp. Review-Url: https://codereview.chromium.org/1933393002 --- tests/FontHostStreamTest.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'tests/FontHostStreamTest.cpp') diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp index 0b436552a3..ec32d9f031 100644 --- a/tests/FontHostStreamTest.cpp +++ b/tests/FontHostStreamTest.cpp @@ -69,9 +69,7 @@ DEF_TEST(FontHostStream, reporter) { paint.setColor(SK_ColorGRAY); paint.setTextSize(SkIntToScalar(30)); - SkTypeface* fTypeface = SkTypeface::CreateFromName("Georgia", - SkTypeface::kNormal); - SkSafeUnref(paint.setTypeface(fTypeface)); + paint.setTypeface(SkTypeface::MakeFromName("Georgia", SkTypeface::kNormal)); SkIRect origRect = SkIRect::MakeWH(64, 64); SkBitmap origBitmap; @@ -89,23 +87,18 @@ DEF_TEST(FontHostStream, reporter) { drawBG(&origCanvas); origCanvas.drawText("A", 1, point.fX, point.fY, paint); - SkTypeface* origTypeface = paint.getTypeface(); - SkAutoTUnref aur; - if (nullptr == origTypeface) { - aur.reset(SkTypeface::RefDefault()); - origTypeface = aur.get(); - } - + sk_sp typeface(SkToBool(paint.getTypeface()) ? sk_ref_sp(paint.getTypeface()) + : SkTypeface::MakeDefault()); int ttcIndex; - SkAutoTDelete fontData(origTypeface->openStream(&ttcIndex)); - SkTypeface* streamTypeface = SkTypeface::CreateFromStream(fontData.release()); + SkAutoTDelete fontData(typeface->openStream(&ttcIndex)); + sk_sp streamTypeface(SkTypeface::MakeFromStream(fontData.release())); SkFontDescriptor desc; bool isLocalStream = false; streamTypeface->getFontDescriptor(&desc, &isLocalStream); REPORTER_ASSERT(reporter, isLocalStream); - SkSafeUnref(paint.setTypeface(streamTypeface)); + paint.setTypeface(streamTypeface); drawBG(&streamCanvas); streamCanvas.drawPosText("A", 1, &point, paint); -- cgit v1.2.3