diff options
| author |  bungeman <bungeman@google.com> | 2016-08-02 14:40:46 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-02 14:40:46 -0700 |
| commit | 38d909ec2875f79952de08f36adfaac5680d2c53 (patch) | |
| tree | a11067146b42f3faa8531d6ef912f7246bbde1f2 /tests/AnnotationTest.cpp | |
| parent | ada5a44f3bdac10a8a0c53b34f5add7aea9fdbb0 (diff) | |
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
Diffstat (limited to 'tests/AnnotationTest.cpp')
| -rw-r--r-- | tests/AnnotationTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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<SkData> 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<SkData> data(SkData::MakeWithCString("http://www.gooogle.com")); SkAnnotateRectWithURL(canvas, r, data.get()); REPORTER_ASSERT(reporter, doc->close()); - SkAutoDataUnref out(outStream.copyToData()); + sk_sp<SkData> 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<SkData> data(SkData::MakeWithCString("example")); SkAnnotateNamedDestination(canvas, p, data.get()); REPORTER_ASSERT(reporter, doc->close()); - SkAutoDataUnref out(outStream.copyToData()); + sk_sp<SkData> out(outStream.copyToData()); const char* rawOutput = (const char*)out->data(); REPORTER_ASSERT(reporter, |