diff options
| author |  Joe Gregorio <jcgregorio@google.com> | 2017-01-20 14:21:27 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-20 14:21:42 +0000 |
| commit | c485907f0420e5f9cf8223e9ba53812cd8dd5368 (patch) | |
| tree | ccb8bf27442eabffd30127e5f0ae635e6fc63f73 /src/image | |
| parent | 1e18aecd0b5bdb6dea0b0bcebf985a8bb221e6a6 (diff) | |
Revert "explictly fail to draw unpremul, as this is buggy, incomplete, tricky, and unused"
This reverts commit 1baaacac74d24604e3dfca9857fbd647df375997.
Reason for revert: Failing the roll: https://storage.googleapis.com/chromium-layout-test-archives/linux_trusty_blink_rel/3868/layout-test-results/results.html
Original change's description:
> explictly fail to draw unpremul, as this is buggy, incomplete, tricky, and unused
>
> BUG=skia:
>
> Change-Id: Ie9da6015cc4955c0f27f6db53fc6ae532e0132f4
> Reviewed-on: https://skia-review.googlesource.com/7304
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Matt Sarett <msarett@google.com>
>
TBR=bsalomon@google.com,msarett@google.com,brianosman@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Ifc808a430b8afe4fef6df3775c2bfdcede1a2dd7
Reviewed-on: https://skia-review.googlesource.com/7329
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/SkImageShader.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/image/SkImageShader.cpp b/src/image/SkImageShader.cpp index 5cb1c24c5a..5b79fb1d9e 100644 --- a/src/image/SkImageShader.cpp +++ b/src/image/SkImageShader.cpp @@ -103,10 +103,6 @@ static bool bitmap_is_too_big(int w, int h) { sk_sp<SkShader> SkImageShader::Make(sk_sp<SkImage> image, TileMode tx, TileMode ty, const SkMatrix* localMatrix, SkTBlitterAllocator* allocator) { - if (image && as_IB(image)->onAlphaType() == kUnpremul_SkAlphaType) { - return nullptr; - } - SkShader* shader; if (!image || bitmap_is_too_big(image->width(), image->height())) { if (nullptr == allocator) { |