| Index: src/core/SkPictureShader.cpp
|
| diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp
|
| index 9084e92f967d09fbc4048f540c51c9e4612f5e1e..27cbb00f63d0bd0ad0a9feaea43a75e97783c092 100644
|
| --- a/src/core/SkPictureShader.cpp
|
| +++ b/src/core/SkPictureShader.cpp
|
| @@ -18,10 +18,8 @@
|
| #include "GrContext.h"
|
| #endif
|
|
|
| -SkPictureShader::SkPictureShader(SkPicture* picture, TileMode tmx, TileMode tmy,
|
| - const SkMatrix* localMatrix)
|
| - : INHERITED(localMatrix)
|
| - , fPicture(SkRef(picture))
|
| +SkPictureShader::SkPictureShader(SkPicture* picture, TileMode tmx, TileMode tmy)
|
| + : fPicture(SkRef(picture))
|
| , fTmx(tmx)
|
| , fTmy(tmy) { }
|
|
|
| @@ -36,8 +34,7 @@
|
| fPicture->unref();
|
| }
|
|
|
| -SkPictureShader* SkPictureShader::Create(SkPicture* picture, TileMode tmx, TileMode tmy,
|
| - const SkMatrix* localMatrix) {
|
| +SkPictureShader* SkPictureShader::Create(SkPicture* picture, TileMode tmx, TileMode tmy) {
|
| if (!picture || 0 == picture->width() || 0 == picture->height()) {
|
| return NULL;
|
| }
|
| @@ -82,7 +79,6 @@
|
|
|
| SkAutoMutexAcquire ama(fCachedBitmapShaderMutex);
|
|
|
| - // TODO(fmalita): remove fCachedLocalMatrix from this key after getLocalMatrix is removed.
|
| if (!fCachedBitmapShader || tileScale != fCachedTileScale ||
|
| this->getLocalMatrix() != fCachedLocalMatrix) {
|
| SkBitmap bm;
|
|
|