From 9a9a7b29e5e5916a7b6453cd124ca437f14b9da4 Mon Sep 17 00:00:00 2001 From: scroggo Date: Thu, 12 May 2016 06:22:30 -0700 Subject: Revert of Move SkTypeface to sk_sp. (patchset #5 id:80001 of https://codereview.chromium.org/1933393002/ ) Reason for revert: fontmgr_iterAndroid failing to draw emoji. E.g. https://gold.skia.org/search2?blame=6296da736fbf40aae881650c239420f64e576c3f&unt=true&head=true&query=source_type%3Dgm Original issue's description: > Move SkTypeface to sk_sp. > > Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f TBR=reed@google.com,fmalita@chromium.org,tomhudson@google.com,bungeman@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/1974783002 --- tests/TextBlobCacheTest.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/TextBlobCacheTest.cpp') diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp index cbc6b99f84..23f45a4cad 100644 --- a/tests/TextBlobCacheTest.cpp +++ b/tests/TextBlobCacheTest.cpp @@ -99,11 +99,12 @@ static void text_blob_cache_inner(skiatest::Reporter* reporter, GrContext* conte set->getStyle(j, &fs, nullptr); // We use a typeface which randomy returns unexpected mask formats to fuzz - sk_sp orig(set->createTypeface(j)); + SkAutoTUnref orig(set->createTypeface(j)); if (normal) { paint.setTypeface(orig); } else { - paint.setTypeface(sk_make_sp(orig, paint, true)); + SkAutoTUnref typeface(new SkRandomTypeface(orig, paint, true)); + paint.setTypeface(typeface); } SkTextBlobBuilder builder; -- cgit v1.2.3