diff options
| author |  Hal Canary <halcanary@google.com> | 2016-11-07 11:47:44 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-07 17:22:19 +0000 |
| commit | 67b39de70fb5d10caebfc75f418754186e5226c3 (patch) | |
| tree | 53a773248fb4dbc02bdf71c89e9619398c5f2f95 /src/svg | |
| parent | 09c85a53c370325d4e8646e34be7684728a1f375 (diff) | |
s/SkAutoTUnref/sk_sp/ in src/ part 1
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4480
Change-Id: I7d3219b02ad5094785e1b7635a9482e69aadbc8c
Reviewed-on: https://skia-review.googlesource.com/4480
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/SkSVGCanvas.cpp | 4 | ||||
| -rw-r--r-- | src/svg/SkSVGDevice.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/svg/SkSVGCanvas.cpp b/src/svg/SkSVGCanvas.cpp index b6634b8a1d..d3511c031f 100644 --- a/src/svg/SkSVGCanvas.cpp +++ b/src/svg/SkSVGCanvas.cpp @@ -11,7 +11,7 @@ SkCanvas* SkSVGCanvas::Create(const SkRect& bounds, SkXMLWriter* writer) { // TODO: pass full bounds to the device SkISize size = bounds.roundOut().size(); - SkAutoTUnref<SkBaseDevice> device(SkSVGDevice::Create(size, writer)); + sk_sp<SkBaseDevice> device(SkSVGDevice::Create(size, writer)); - return new SkCanvas(device); + return new SkCanvas(device.get()); } diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp index 203be3ae8b..ffdf034ab1 100644 --- a/src/svg/SkSVGDevice.cpp +++ b/src/svg/SkSVGDevice.cpp @@ -546,7 +546,7 @@ void SkSVGDevice::AutoElement::addTextAttributes(const SkPaint& paint) { this->addAttribute("font-weight", "bold"); } - SkAutoTUnref<SkTypeface::LocalizedStrings> familyNameIter(tface->createFamilyNameIterator()); + sk_sp<SkTypeface::LocalizedStrings> familyNameIter(tface->createFamilyNameIterator()); SkTypeface::LocalizedString familyString; while (familyNameIter->next(&familyString)) { if (familySet.contains(familyString.fString)) { @@ -661,7 +661,7 @@ void SkSVGDevice::drawPath(const SkDraw& draw, const SkPath& path, const SkPaint void SkSVGDevice::drawBitmapCommon(const SkDraw& draw, const SkBitmap& bm, const SkPaint& paint) { - SkAutoTUnref<const SkData> pngData( + sk_sp<const SkData> pngData( SkImageEncoder::EncodeData(bm, SkImageEncoder::kPNG_Type, SkImageEncoder::kDefaultQuality)); if (!pngData) { return; |