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

Unified Diff: third_party/WebKit/Source/platform/graphics/ImagePattern.cpp

Issue 2007553002: Retire setGradientSpaceTransform, setPatternSpaceTransform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more expectations Created 4 years, 7 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/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 287fd124498edcfa51663c1da581a42f60292d0e..1300248523201d9142e1768f7ea91fd329dbd872 100644
--- a/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp
+++ b/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp
@@ -30,16 +30,14 @@ ImagePattern::ImagePattern(PassRefPtr<Image> image, RepeatMode repeatMode)
}
}
-sk_sp<SkShader> ImagePattern::createShader() const
+sk_sp<SkShader> ImagePattern::createShader(const SkMatrix* localMatrix) const
{
if (!m_tileImage)
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 m_tileImage->makeShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &localMatrix);
+ return m_tileImage->makeShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, localMatrix);
}
// Skia does not have a "draw the tile only once" option. Clamp_TileMode
@@ -67,7 +65,7 @@ sk_sp<SkShader> ImagePattern::createShader() const
paint.setXfermodeMode(SkXfermode::kSrc_Mode);
surface->getCanvas()->drawImage(m_tileImage, 0, 0, &paint);
- return surface->makeImageSnapshot()->makeShader(tileModeX, tileModeY, &localMatrix);
+ return surface->makeImageSnapshot()->makeShader(tileModeX, tileModeY, localMatrix);
}
bool ImagePattern::isTextureBacked() const

Powered by Google App Engine
This is Rietveld 408576698