diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-11-21 12:09:17 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:18 +0100 |
| commit | 8f7e6f583953c6cdc9736d5dd120fddbde98ce8b (patch) | |
| tree | 061c022c5913f4bb1b2d995f4a238b6de0f72913 /external/skia | |
| parent | d9879200ca3c0167b982ffecfa927bfac46b94c6 (diff) | |
patch Skia bug with copying data with different alpha type
https://bugs.chromium.org/p/skia/issues/detail?id=9662
Change-Id: Ic5208c2c817912cddbfae4b86e3b3647306262fb
Diffstat (limited to 'external/skia')
| -rw-r--r-- | external/skia/UnpackedTarball_skia.mk | 1 | ||||
| -rw-r--r-- | external/skia/fix-alpha-difference-copy.patch.1 | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index 1fab368cc34b..aabb1149a3ae 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -19,6 +19,7 @@ skia_patches := \ make-api-visible.patch.1 \ fix-shader-locale.patch.1 \ no-trace-resources-on-exit.patch.1 \ + fix-alpha-difference-copy.patch.1 \ share-grcontext.patch.1 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/external/skia/fix-alpha-difference-copy.patch.1 b/external/skia/fix-alpha-difference-copy.patch.1 new file mode 100644 index 000000000000..d9e992a770a7 --- /dev/null +++ b/external/skia/fix-alpha-difference-copy.patch.1 @@ -0,0 +1,13 @@ +diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp +index 89b107b939..042d8e65aa 100644 +--- a/src/core/SkBlitter_Sprite.cpp ++++ b/src/core/SkBlitter_Sprite.cpp +@@ -178,7 +178,7 @@ SkBlitter* SkBlitter::ChooseSprite(const SkPixmap& dst, const SkPaint& paint, + */ + SkASSERT(allocator != nullptr); + +- if (source.alphaType() == kUnpremul_SkAlphaType) { ++ if (source.alphaType() != dst.alphaType()) { + return nullptr; + } + |