| Index: third_party/WebKit/Source/platform/graphics/Pattern.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/Pattern.cpp b/third_party/WebKit/Source/platform/graphics/Pattern.cpp
|
| index 2c279181992ab079aebd65cf407deb037821f2e2..608ef881bc8e43f1e4577ebbad6965385d25f701 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/Pattern.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/Pattern.cpp
|
| @@ -60,21 +60,28 @@ Pattern::~Pattern()
|
| adjustExternalMemoryAllocated(-m_externalMemoryAllocated);
|
| }
|
|
|
| -void Pattern::applyToPaint(SkPaint& paint)
|
| +namespace {
|
| +
|
| +inline bool cachedShaderIsValid(const sk_sp<SkShader>& shader, const SkMatrix* matrix)
|
| {
|
| - if (!m_pattern)
|
| - m_pattern = createShader();
|
| + if (!shader)
|
| + return false;
|
| +
|
| + const SkMatrix& shaderLocalMatrix = shader->getLocalMatrix();
|
| + if (!matrix)
|
| + return shaderLocalMatrix.isIdentity();
|
|
|
| - paint.setShader(m_pattern);
|
| + return shaderLocalMatrix == *matrix;
|
| }
|
|
|
| -void Pattern::setPatternSpaceTransform(const AffineTransform& patternSpaceTransformation)
|
| +} // anonymous namespace
|
| +
|
| +void Pattern::applyToPaint(SkPaint& paint, const SkMatrix* localMatrix) const
|
| {
|
| - if (patternSpaceTransformation == m_patternSpaceTransformation)
|
| - return;
|
| + if (!cachedShaderIsValid(m_cachedShader, localMatrix))
|
| + m_cachedShader = createShader(localMatrix);
|
|
|
| - m_patternSpaceTransformation = patternSpaceTransformation;
|
| - m_pattern.reset();
|
| + paint.setShader(m_cachedShader);
|
| }
|
|
|
| void Pattern::adjustExternalMemoryAllocated(int64_t delta)
|
|
|