Index: third_party/WebKit/Source/platform/graphics/ImagePattern.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp b/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp |
index 32f4aa92910d0cbfee0cbbb372ef28af52f425e3..a11609e81d670e9b060dd051b404db78b85ec5e7 100644 |
--- a/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp |
@@ -30,16 +30,16 @@ ImagePattern::ImagePattern(PassRefPtr<Image> image, RepeatMode repeatMode) |
} |
} |
-PassRefPtr<SkShader> ImagePattern::createShader() |
+sk_sp<SkShader> ImagePattern::createShader() |
{ |
if (!m_tileImage) |
- return adoptRef(SkShader::CreateColorShader(SK_ColorTRANSPARENT)); |
+ return SkShader::MakeColorShader(SK_ColorTRANSPARENT); |
SkMatrix localMatrix = affineTransformToSkMatrix(m_patternSpaceTransformation); |
if (isRepeatXY()) { |
// Fast path: for repeatXY we just return a shader from the original image. |
- return adoptRef(m_tileImage->newShader(SkShader::kRepeat_TileMode, |
+ return sk_sp<SkShader>(m_tileImage->newShader(SkShader::kRepeat_TileMode, |
SkShader::kRepeat_TileMode, &localMatrix)); |
} |
@@ -61,7 +61,7 @@ PassRefPtr<SkShader> ImagePattern::createShader() |
RefPtr<SkSurface> surface = adoptRef(SkSurface::NewRasterN32Premul( |
m_tileImage->width() + expandW, m_tileImage->height() + expandH)); |
if (!surface) |
- return adoptRef(SkShader::CreateColorShader(SK_ColorTRANSPARENT)); |
+ return SkShader::MakeColorShader(SK_ColorTRANSPARENT); |
surface->getCanvas()->clear(SK_ColorTRANSPARENT); |
SkPaint paint; |
@@ -69,7 +69,7 @@ PassRefPtr<SkShader> ImagePattern::createShader() |
surface->getCanvas()->drawImage(m_tileImage.get(), 0, 0, &paint); |
RefPtr<SkImage> expandedImage = adoptRef(surface->newImageSnapshot()); |
- return adoptRef(expandedImage->newShader(tileModeX, tileModeY, &localMatrix)); |
+ return sk_sp<SkShader>(expandedImage->newShader(tileModeX, tileModeY, &localMatrix)); |
} |
bool ImagePattern::isTextureBacked() const |