diff options
| author |  bungeman <bungeman@google.com> | 2016-05-11 12:38:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-11 12:38:18 -0700 |
| commit | 6296da736fbf40aae881650c239420f64e576c3f (patch) | |
| tree | 5121ecf46ff7099d8eb66d2b2a4671d5ad94db89 /tests/FontObjTest.cpp | |
| parent | c8699321b924c1f284df93cb29b86000c1d73c0a (diff) | |
Move SkTypeface to sk_sp.
Review-Url: https://codereview.chromium.org/1933393002
Diffstat (limited to 'tests/FontObjTest.cpp')
| -rw-r--r-- | tests/FontObjTest.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/FontObjTest.cpp b/tests/FontObjTest.cpp index 9d18ce6b2e..66c8bd500f 100644 --- a/tests/FontObjTest.cpp +++ b/tests/FontObjTest.cpp @@ -23,7 +23,7 @@ static bool is_enable_bytecode_hints(const SkPaint& paint) { } static void test_cachedfont(skiatest::Reporter* reporter, const SkPaint& paint) { - SkAutoTUnref<SkFont> font(SkFont::Testing_CreateFromPaint(paint)); + sk_sp<SkFont> font(SkFont::Testing_CreateFromPaint(paint)); // Currently SkFont resolves null into the default, so only test if paint's is not null if (paint.getTypeface()) { @@ -78,8 +78,7 @@ static void test_cachedfont(skiatest::Reporter* reporter) { char txt[] = "long.text.with.lots.of.dots."; for (size_t i = 0; i < SK_ARRAY_COUNT(faces); i++) { - SkAutoTUnref<SkTypeface> face(SkTypeface::CreateFromName(faces[i], SkTypeface::kNormal)); - paint.setTypeface(face); + paint.setTypeface(SkTypeface::MakeFromName(faces[i], SkTypeface::kNormal)); for (size_t j = 0; j < SK_ARRAY_COUNT(settings); j++) { paint.setHinting(settings[j].hinting); @@ -103,7 +102,7 @@ static void test_cachedfont(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, width1 == width2); - SkAutoTUnref<SkFont> font(SkFont::Testing_CreateFromPaint(paint)); + sk_sp<SkFont> font(SkFont::Testing_CreateFromPaint(paint)); SkScalar font_width1 = font->measureText(txt, strlen(txt), kUTF8_SkTextEncoding); // measureText not yet implemented... REPORTER_ASSERT(reporter, font_width1 == -1); |