Index: tests/FontHostStreamTest.cpp |
diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp |
index 0b436552a3c9a232bea50626ea26cb21edb87989..7f269c4c31a67d9839161f4e982028f5cca57e7e 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; |
@@ -90,22 +88,22 @@ DEF_TEST(FontHostStream, reporter) { |
origCanvas.drawText("A", 1, point.fX, point.fY, paint); |
SkTypeface* origTypeface = paint.getTypeface(); |
- SkAutoTUnref<SkTypeface> aur; |
+ sk_sp<SkTypeface> defaultTypeface; |
if (nullptr == origTypeface) { |
- aur.reset(SkTypeface::RefDefault()); |
- origTypeface = aur.get(); |
+ defaultTypeface = SkTypeface::MakeDefault(); |
+ origTypeface = defaultTypeface.get(); |
tomhudson
2016/04/29 21:10:36
How about SkTypeface::MakeDefault().get(), and get
bungeman-skia
2016/04/29 22:03:24
Done.
|
} |
int ttcIndex; |
SkAutoTDelete<SkStreamAsset> fontData(origTypeface->openStream(&ttcIndex)); |
- SkTypeface* streamTypeface = SkTypeface::CreateFromStream(fontData.release()); |
+ auto 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); |