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/AnnotationTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/AnnotationTest.cpp') diff --git a/tests/AnnotationTest.cpp b/tests/AnnotationTest.cpp index 400d4887bd..a4109c5e54 100644 --- a/tests/AnnotationTest.cpp +++ b/tests/AnnotationTest.cpp @@ -31,7 +31,7 @@ DEF_TEST(Annotation_NoDraw, reporter) { SkCanvas canvas(bm); SkRect r = SkRect::MakeWH(SkIntToScalar(10), SkIntToScalar(10)); - SkAutoDataUnref data(SkData::NewWithCString("http://www.gooogle.com")); + sk_sp data(SkData::MakeWithCString("http://www.gooogle.com")); REPORTER_ASSERT(reporter, 0 == *bm.getAddr32(0, 0)); SkAnnotateRectWithURL(&canvas, r, data.get()); @@ -47,11 +47,11 @@ DEF_TEST(Annotation_PdfLink, reporter) { SkRect r = SkRect::MakeXYWH(SkIntToScalar(72), SkIntToScalar(72), SkIntToScalar(288), SkIntToScalar(72)); - SkAutoDataUnref data(SkData::NewWithCString("http://www.gooogle.com")); + sk_sp data(SkData::MakeWithCString("http://www.gooogle.com")); SkAnnotateRectWithURL(canvas, r, data.get()); REPORTER_ASSERT(reporter, doc->close()); - SkAutoDataUnref out(outStream.copyToData()); + sk_sp out(outStream.copyToData()); const char* rawOutput = (const char*)out->data(); REPORTER_ASSERT(reporter, ContainsString(rawOutput, out->size(), "/Annots ")); @@ -65,11 +65,11 @@ DEF_TEST(Annotation_NamedDestination, reporter) { REPORTER_ASSERT(reporter, canvas); SkPoint p = SkPoint::Make(SkIntToScalar(72), SkIntToScalar(72)); - SkAutoDataUnref data(SkData::NewWithCString("example")); + sk_sp data(SkData::MakeWithCString("example")); SkAnnotateNamedDestination(canvas, p, data.get()); REPORTER_ASSERT(reporter, doc->close()); - SkAutoDataUnref out(outStream.copyToData()); + sk_sp out(outStream.copyToData()); const char* rawOutput = (const char*)out->data(); REPORTER_ASSERT(reporter, -- cgit v1.2.3