From 824075071885b6b741c141cbe2134d8345d34589 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 9 Nov 2016 13:59:58 -0500 Subject: Change SkCanvas to *not* inherit from SkRefCnt Definitely tricky for classes like SkNWayCanvas, where the caller (today) need not pay attention to ownership of the canvases it gave the NWay (after this CL, the caller *must* managed ownership) BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4441 DOCS_PREVIEW= https://skia.org/?cl=4441 Change-Id: Ib1ac07a3cdf0686d78e7aaa4735d45cc90bea081 Reviewed-on: https://skia-review.googlesource.com/4441 Commit-Queue: Mike Reed Reviewed-by: Florin Malita Reviewed-by: Robert Phillips --- tests/SVGDeviceTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/SVGDeviceTest.cpp') diff --git a/tests/SVGDeviceTest.cpp b/tests/SVGDeviceTest.cpp index b010e57909..715dbc7c15 100644 --- a/tests/SVGDeviceTest.cpp +++ b/tests/SVGDeviceTest.cpp @@ -91,7 +91,7 @@ void test_whitespace_pos(skiatest::Reporter* reporter, { SkXMLParserWriter writer(dom.beginParsing()); - sk_sp svgCanvas(SkSVGCanvas::Create(SkRect::MakeWH(100, 100), &writer)); + std::unique_ptr svgCanvas = SkSVGCanvas::Make(SkRect::MakeWH(100, 100), &writer); svgCanvas->drawText(txt, len, offset.x(), offset.y(), paint); } check_text_node(reporter, dom, dom.finishParsing(), offset, 0, expected); @@ -103,7 +103,7 @@ void test_whitespace_pos(skiatest::Reporter* reporter, } SkXMLParserWriter writer(dom.beginParsing()); - sk_sp svgCanvas(SkSVGCanvas::Create(SkRect::MakeWH(100, 100), &writer)); + std::unique_ptr svgCanvas = SkSVGCanvas::Make(SkRect::MakeWH(100, 100), &writer); svgCanvas->drawPosTextH(txt, len, xpos, offset.y(), paint); } check_text_node(reporter, dom, dom.finishParsing(), offset, 1, expected); @@ -115,7 +115,7 @@ void test_whitespace_pos(skiatest::Reporter* reporter, } SkXMLParserWriter writer(dom.beginParsing()); - sk_sp svgCanvas(SkSVGCanvas::Create(SkRect::MakeWH(100, 100), &writer)); + std::unique_ptr svgCanvas = SkSVGCanvas::Make(SkRect::MakeWH(100, 100), &writer); svgCanvas->drawPosText(txt, len, pos, paint); } check_text_node(reporter, dom, dom.finishParsing(), offset, 2, expected); -- cgit v1.2.3