diff options
| author |  Hal Canary <halcanary@google.com> | 2016-11-07 14:13:52 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-07 19:59:56 +0000 |
| commit | 704cd32e4a92d6c3eae6bfae4adcc20126bf4437 (patch) | |
| tree | f055a8a0b01f5ed899883f46224a096ed7cc43bd /src/core/SkCanvas.cpp | |
| parent | e9592f56c859752cf19095fb8ffeb6777835a65b (diff) | |
src/core: s/SkAutoTUnref/sk_sp/g
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4492
Change-Id: I753ad01b03e891221965252e3befe280d09cdb9f
Reviewed-on: https://skia-review.googlesource.com/4492
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index c42ee860f3..cd4dcbc2a5 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -762,8 +762,8 @@ SkCanvas::SkCanvas(const SkBitmap& bitmap, const SkSurfaceProps& props) { inc_canvas(); - SkAutoTUnref<SkBaseDevice> device(new SkBitmapDevice(bitmap, fProps)); - this->init(device, kDefault_InitFlags); + sk_sp<SkBaseDevice> device(new SkBitmapDevice(bitmap, fProps)); + this->init(device.get(), kDefault_InitFlags); } SkCanvas::SkCanvas(const SkBitmap& bitmap) @@ -773,8 +773,8 @@ SkCanvas::SkCanvas(const SkBitmap& bitmap) { inc_canvas(); - SkAutoTUnref<SkBaseDevice> device(new SkBitmapDevice(bitmap, fProps)); - this->init(device, kDefault_InitFlags); + sk_sp<SkBaseDevice> device(new SkBitmapDevice(bitmap, fProps)); + this->init(device.get(), kDefault_InitFlags); } SkCanvas::~SkCanvas() { @@ -1248,7 +1248,7 @@ void SkCanvas::internalSaveLayer(const SaveLayerRec& rec, SaveLayerStrategy stra SkImageInfo info = make_layer_info(priorDevice->imageInfo(), ir.width(), ir.height(), isOpaque, paint); - SkAutoTUnref<SkBaseDevice> newDevice; + sk_sp<SkBaseDevice> newDevice; { const bool preserveLCDText = kOpaque_SkAlphaType == info.alphaType() || (saveLayerFlags & kPreserveLCDText_SaveLayerFlag); @@ -1262,14 +1262,15 @@ void SkCanvas::internalSaveLayer(const SaveLayerRec& rec, SaveLayerStrategy stra } newDevice->setOrigin(ir.fLeft, ir.fTop); - DeviceCM* layer = new DeviceCM(newDevice, paint, this, fConservativeRasterClip, stashedMatrix); + DeviceCM* layer = + new DeviceCM(newDevice.get(), paint, this, fConservativeRasterClip, stashedMatrix); layer->fNext = fMCRec->fTopLayer; fMCRec->fLayer = layer; fMCRec->fTopLayer = layer; // this field is NOT an owner of layer if (rec.fBackdrop) { - DrawDeviceWithFilter(priorDevice, rec.fBackdrop, newDevice, + DrawDeviceWithFilter(priorDevice, rec.fBackdrop, newDevice.get(), fMCRec->fMatrix, this->getClipStack()); } } |