Chromium Code Reviews| Index: src/core/SkPicturePlayback.cpp |
| diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp |
| index ae3c3f20afadddd13dd46c4e038ba6071e80d393..e211c2be674bf2cc694615dac936927bb1c1e029 100644 |
| --- a/src/core/SkPicturePlayback.cpp |
| +++ b/src/core/SkPicturePlayback.cpp |
| @@ -307,13 +307,13 @@ void SkPicturePlayback::handleOp(SkReader32* reader, |
| texCoords = (const SkPoint*)reader->skip(SkPatchUtils::kNumCorners * |
| sizeof(SkPoint)); |
| } |
| - SkAutoTUnref<SkXfermode> xfer; |
| + sk_sp<SkXfermode> xfer; |
| if (flag & DRAW_VERTICES_HAS_XFER) { |
| int mode = reader->readInt(); |
| if (mode < 0 || mode > SkXfermode::kLastMode) { |
| mode = SkXfermode::kModulate_Mode; |
| } |
| - xfer.reset(SkXfermode::Create((SkXfermode::Mode)mode)); |
| + xfer = SkXfermode::Make((SkXfermode::Mode)mode); |
| } |
| canvas->drawPatch(cubics, colors, texCoords, xfer, paint); |
|
f(malita)
2016/03/28 18:44:59
nit: std::move(xfer)?
reed1
2016/03/29 16:13:52
Done.
|
| } break; |
| @@ -435,7 +435,7 @@ void SkPicturePlayback::handleOp(SkReader32* reader, |
| canvas->drawTextOnPath(text.text(), text.length(), path, &matrix, paint); |
| } break; |
| case DRAW_VERTICES: { |
| - SkAutoTUnref<SkXfermode> xfer; |
| + sk_sp<SkXfermode> xfer; |
| const SkPaint& paint = *fPictureData->getPaint(reader); |
| DrawVertexFlags flags = (DrawVertexFlags)reader->readInt(); |
| SkCanvas::VertexMode vmode = (SkCanvas::VertexMode)reader->readInt(); |
| @@ -460,7 +460,7 @@ void SkPicturePlayback::handleOp(SkReader32* reader, |
| if (mode < 0 || mode > SkXfermode::kLastMode) { |
| mode = SkXfermode::kModulate_Mode; |
| } |
| - xfer.reset(SkXfermode::Create((SkXfermode::Mode)mode)); |
| + xfer = SkXfermode::Make((SkXfermode::Mode)mode); |
| } |
| canvas->drawVertices(vmode, vCount, verts, texs, colors, xfer, indices, iCount, paint); |
|
f(malita)
2016/03/28 18:44:59
nit: ditto
reed1
2016/03/29 16:13:52
Done.
|
| } break; |