From 38d909ec2875f79952de08f36adfaac5680d2c53 Mon Sep 17 00:00:00 2001 From: bungeman Date: Tue, 2 Aug 2016 14:40:46 -0700 Subject: Move off SK_SUPPORT_LEGACY_DATA_FACTORIES. This moves Skia code off of SK_SUPPORT_LEGACY_DATA_FACTORIES. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2206633004 Review-Url: https://codereview.chromium.org/2206633004 --- tests/PDFJpegEmbedTest.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tests/PDFJpegEmbedTest.cpp') diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp index 5ef4a2dbfc..6b10f04932 100644 --- a/tests/PDFJpegEmbedTest.cpp +++ b/tests/PDFJpegEmbedTest.cpp @@ -38,10 +38,10 @@ static bool is_subset_of(SkData* smaller, SkData* larger) { } -static SkData* load_resource( +static sk_sp load_resource( skiatest::Reporter* r, const char* test, const char* filename) { SkString path(GetResourcePath(filename)); - SkData* data = SkData::NewFromFileName(path.c_str()); + sk_sp data(SkData::MakeFromFileName(path.c_str())); if (!data) { INFOF(r, "\n%s: Resource '%s' can not be found.\n", test, filename); @@ -124,13 +124,12 @@ DEF_TEST(JpegIdentification, r) { {"mandrill_512_q075.jpg", true, SkJFIFInfo::kYCbCr}, {"randPixels.jpg", true, SkJFIFInfo::kYCbCr}}; for (size_t i = 0; i < SK_ARRAY_COUNT(kTests); ++i) { - SkAutoTUnref data( - load_resource(r, "JpegIdentification", kTests[i].path)); + sk_sp data(load_resource(r, "JpegIdentification", kTests[i].path)); if (!data) { continue; } SkJFIFInfo info; - bool isJfif = SkIsJFIF(data, &info); + bool isJfif = SkIsJFIF(data.get(), &info); if (isJfif != kTests[i].isJfif) { ERRORF(r, "%s failed isJfif test", kTests[i].path); continue; -- cgit v1.2.3