diff options
| author |  Hal Canary <halcanary@google.com> | 2017-02-02 19:49:27 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-02 19:49:39 +0000 |
| commit | 0e86725ba4f667056ff1ef65275165853a47303b (patch) | |
| tree | d0c661560a03dccee828bf4660d37d389f1ecb60 /src/core | |
| parent | aa2bd8f726d98edafd28c8553e99cbae33c431dd (diff) | |
Revert "Don't instantiate shaders with non-invertible local matrix"
This reverts commit ebfbba9bbdacd754c8ad7429ee066f53f17bc66b.
Reason for revert: breaks chrome blink tests for linux_trusty_blink_rel
Original change's description:
> Don't instantiate shaders with non-invertible local matrix
>
> Change-Id: If11f7d57cbf45929632d858f91c02d8f5fa9f442
> Reviewed-on: https://skia-review.googlesource.com/7885
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Florin Malita <fmalita@chromium.org>
>
TBR=fmalita@chromium.org,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I41c5513523c27dc4bad68008f08369185897b7a2
Reviewed-on: https://skia-review.googlesource.com/7948
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkShader.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index 9f97a7a74a..9e562c9276 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -241,17 +241,11 @@ sk_sp<SkShader> SkShader::MakeColorShader(SkColor color) { return sk_make_sp<SkC sk_sp<SkShader> SkShader::MakeBitmapShader(const SkBitmap& src, TileMode tmx, TileMode tmy, const SkMatrix* localMatrix) { - if (localMatrix && !localMatrix->invert(nullptr)) { - return nullptr; - } return SkMakeBitmapShader(src, tmx, tmy, localMatrix, kIfMutable_SkCopyPixelsMode, nullptr); } sk_sp<SkShader> SkShader::MakePictureShader(sk_sp<SkPicture> src, TileMode tmx, TileMode tmy, const SkMatrix* localMatrix, const SkRect* tile) { - if (localMatrix && !localMatrix->invert(nullptr)) { - return nullptr; - } return SkPictureShader::Make(std::move(src), tmx, tmy, localMatrix, tile); } |