From 1b0aa001e8f5245663965992f32df6a43cb22e2f Mon Sep 17 00:00:00 2001 From: scroggo Date: Fri, 11 Jul 2014 12:19:00 -0700 Subject: No need to cache local matrix in picture shader. Now that the local matrix cannot be changed, we no longer need to keep track of it to regenerate the bitmap shader. Depends on https://codereview.chromium.org/379323002 R=fmalita@google.com, fmalita@chromium.org Author: scroggo@google.com Review URL: https://codereview.chromium.org/387043002 --- src/core/SkPictureShader.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/core/SkPictureShader.cpp') diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp index d6b84c356a..ab4de039fb 100644 --- a/src/core/SkPictureShader.cpp +++ b/src/core/SkPictureShader.cpp @@ -81,9 +81,7 @@ SkShader* SkPictureShader::refBitmapShader(const SkMatrix& matrix, const SkMatri SkAutoMutexAcquire ama(fCachedBitmapShaderMutex); - // TODO(fmalita): remove fCachedLocalMatrix from this key after getLocalMatrix is removed. - if (!fCachedBitmapShader || tileScale != fCachedTileScale || - this->getLocalMatrix() != fCachedLocalMatrix) { + if (!fCachedBitmapShader || tileScale != fCachedTileScale) { SkBitmap bm; if (!bm.allocN32Pixels(tileSize.width(), tileSize.height())) { return NULL; @@ -95,7 +93,6 @@ SkShader* SkPictureShader::refBitmapShader(const SkMatrix& matrix, const SkMatri canvas.drawPicture(fPicture); fCachedTileScale = tileScale; - fCachedLocalMatrix = this->getLocalMatrix(); SkMatrix shaderMatrix = this->getLocalMatrix(); shaderMatrix.preScale(1 / tileScale.width(), 1 / tileScale.height()); -- cgit v1.2.3