Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

Issue 1789063005: Add sk_sp helpers and switch Blink SkShader clients to the new APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fromSkSp, review comments Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
index cfff39bdf3c995aacf7a0f325facf0fe58144ecb..12973eaed3fa17d6d7470d25f1fa367e1b8a2916 100644
--- a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
+++ b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
@@ -286,16 +286,14 @@ void SVGImage::drawPatternForContainer(GraphicsContext& context, const FloatSize
SkPaint paint;
drawForContainer(patternPicture.context().canvas(), paint, containerSize, zoom, tile, srcRect, url);
}
- RefPtr<const SkPicture> tilePicture = patternPicture.endRecording();
+ RefPtr<SkPicture> tilePicture = patternPicture.endRecording();
SkMatrix patternTransform;
patternTransform.setTranslate(phase.x() + spacedTile.x(), phase.y() + spacedTile.y());
- RefPtr<SkShader> patternShader = adoptRef(SkShader::CreatePictureShader(
- tilePicture.get(), SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode,
- &patternTransform, nullptr));
SkPaint paint;
- paint.setShader(patternShader.get());
+ paint.setShader(SkShader::MakePictureShader(toSkSp(tilePicture.release()),
+ SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &patternTransform, nullptr));
paint.setXfermodeMode(compositeOp);
paint.setColorFilter(context.colorFilter());
context.drawRect(dstRect, paint);

Powered by Google App Engine
This is Rietveld 408576698