Index: third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp b/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp |
index 874dc95f56eb2e3091df6bf0d2b97bbd4c8efc23..49f8de17a0d04f724b179dfd751b56a7e3f78786 100644 |
--- a/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/GeneratedImage.cpp |
@@ -48,13 +48,13 @@ void GeneratedImage::drawPattern(GraphicsContext& destContext, const FloatRect& |
SkPictureBuilder builder(tileRect, nullptr, &destContext); |
builder.context().beginRecording(tileRect); |
drawTile(builder.context(), srcRect); |
- RefPtr<SkPicture> tilePicture = builder.endRecording(); |
+ sk_sp<SkPicture> tilePicture = builder.endRecording(); |
SkMatrix patternMatrix = SkMatrix::MakeTrans(phase.x(), phase.y()); |
patternMatrix.preScale(scale.width(), scale.height()); |
patternMatrix.preTranslate(tileRect.x(), tileRect.y()); |
- RefPtr<Pattern> picturePattern = Pattern::createPicturePattern(tilePicture.release()); |
+ RefPtr<Pattern> picturePattern = Pattern::createPicturePattern(std::move(tilePicture)); |
SkPaint fillPaint = destContext.fillPaint(); |
picturePattern->applyToPaint(fillPaint, patternMatrix); |
@@ -64,7 +64,7 @@ void GeneratedImage::drawPattern(GraphicsContext& destContext, const FloatRect& |
destContext.drawRect(destRect, fillPaint); |
} |
-PassRefPtr<SkImage> GeneratedImage::imageForCurrentFrame() |
+sk_sp<SkImage> GeneratedImage::imageForCurrentFrame() |
{ |
return nullptr; |
} |