diff options
author | Leon Scroggins III <scroggo@google.com> | 2017-11-14 16:11:40 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-14 21:33:14 +0000 |
commit | 42bae8faa4b9b6a3341b15c6ac7c6b466e95625c (patch) | |
tree | 9768d1ffe37ccadfafab062b80a28d8564a393c8 | |
parent | af71accc86e85f8ea17c516f26364e33480bcb6b (diff) |
Fix webp bug compositing alpha frames on opaque
select_xform_alpha is used to determine how the color transform should
handle alpha values. In a similar way, we're using it here to determine
whether to premultiply pixels before blending them. In this case, the
source is unpremul, so we should be premultiplying them, but since we
are compositing on an opaque frame, the dst must be opaque and
select_xform_alpha returns kOpaque. As a result, we do not premultiply
(and even hint to the transform that the pixels are opaque). Since this
all applies to the pre-blended pixels, we should not care that the dst
is opaque. So drop the call to select_xform_alpha and just use the alpha
type of the source. This matches the comment on the lines above.
Add the test image that failed (https://mathiasbynens.be/demo/animated-webp)
Change-Id: Ibd13c1f067bdf369ce1c882d4f6057aadccfa313
Reviewed-on: https://skia-review.googlesource.com/71560
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
-rw-r--r-- | infra/bots/assets/skimage/VERSION | 2 | ||||
-rw-r--r-- | infra/bots/tasks.json | 552 | ||||
-rw-r--r-- | src/codec/SkWebpCodec.cpp | 7 |
3 files changed, 280 insertions, 281 deletions
diff --git a/infra/bots/assets/skimage/VERSION b/infra/bots/assets/skimage/VERSION index 1758dddcce..dc7b54ad01 100644 --- a/infra/bots/assets/skimage/VERSION +++ b/infra/bots/assets/skimage/VERSION @@ -1 +1 @@ -32
\ No newline at end of file +33
\ No newline at end of file diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index ad20171784..e1815430e8 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -5849,7 +5849,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" } ], "dimensions": [ @@ -7940,7 +7940,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -7987,7 +7987,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8034,7 +8034,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8086,7 +8086,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8138,7 +8138,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8185,7 +8185,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8232,7 +8232,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8284,7 +8284,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8331,7 +8331,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8383,7 +8383,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8430,7 +8430,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8477,7 +8477,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8529,7 +8529,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8576,7 +8576,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8623,7 +8623,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8670,7 +8670,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8717,7 +8717,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8764,7 +8764,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8811,7 +8811,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8858,7 +8858,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8905,7 +8905,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8952,7 +8952,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -8999,7 +8999,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9046,7 +9046,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9093,7 +9093,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9140,7 +9140,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9233,7 +9233,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9285,7 +9285,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9337,7 +9337,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9389,7 +9389,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9446,7 +9446,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9498,7 +9498,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9555,7 +9555,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9607,7 +9607,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9664,7 +9664,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9716,7 +9716,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9773,7 +9773,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9825,7 +9825,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9877,7 +9877,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9929,7 +9929,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -9981,7 +9981,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10028,7 +10028,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10080,7 +10080,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10132,7 +10132,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10184,7 +10184,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10231,7 +10231,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10283,7 +10283,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10335,7 +10335,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10387,7 +10387,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10439,7 +10439,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10491,7 +10491,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10538,7 +10538,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10585,7 +10585,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10632,7 +10632,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10679,7 +10679,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10726,7 +10726,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10773,7 +10773,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10820,7 +10820,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10867,7 +10867,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10914,7 +10914,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -10961,7 +10961,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11008,7 +11008,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11055,7 +11055,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11102,7 +11102,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11149,7 +11149,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11196,7 +11196,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11243,7 +11243,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11290,7 +11290,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11337,7 +11337,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11384,7 +11384,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11431,7 +11431,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11478,7 +11478,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11525,7 +11525,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11572,7 +11572,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11619,7 +11619,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11666,7 +11666,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11713,7 +11713,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11760,7 +11760,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11807,7 +11807,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11854,7 +11854,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11901,7 +11901,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11948,7 +11948,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -11996,7 +11996,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12044,7 +12044,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12092,7 +12092,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12140,7 +12140,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12187,7 +12187,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12234,7 +12234,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12281,7 +12281,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12328,7 +12328,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12375,7 +12375,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12422,7 +12422,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12469,7 +12469,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12516,7 +12516,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12563,7 +12563,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12610,7 +12610,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12657,7 +12657,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12704,7 +12704,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12751,7 +12751,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12798,7 +12798,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12845,7 +12845,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12892,7 +12892,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12939,7 +12939,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -12986,7 +12986,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13033,7 +13033,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13080,7 +13080,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13127,7 +13127,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13174,7 +13174,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13221,7 +13221,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13268,7 +13268,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13315,7 +13315,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13362,7 +13362,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13409,7 +13409,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13456,7 +13456,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -13503,7 +13503,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -15734,7 +15734,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -15781,7 +15781,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -15828,7 +15828,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -15880,7 +15880,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -15932,7 +15932,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -15984,7 +15984,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16036,7 +16036,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16088,7 +16088,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16140,7 +16140,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16192,7 +16192,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16244,7 +16244,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16291,7 +16291,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16338,7 +16338,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16385,7 +16385,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16437,7 +16437,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16484,7 +16484,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16531,7 +16531,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16578,7 +16578,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16625,7 +16625,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16672,7 +16672,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16719,7 +16719,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16766,7 +16766,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16813,7 +16813,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16860,7 +16860,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16907,7 +16907,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -16954,7 +16954,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17001,7 +17001,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17048,7 +17048,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17100,7 +17100,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17147,7 +17147,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17194,7 +17194,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17241,7 +17241,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17288,7 +17288,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17335,7 +17335,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17387,7 +17387,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17439,7 +17439,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17486,7 +17486,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17533,7 +17533,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17580,7 +17580,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17627,7 +17627,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17674,7 +17674,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17721,7 +17721,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17768,7 +17768,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17815,7 +17815,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17862,7 +17862,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17909,7 +17909,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -17956,7 +17956,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18003,7 +18003,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18050,7 +18050,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18097,7 +18097,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18144,7 +18144,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18191,7 +18191,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18307,7 +18307,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18359,7 +18359,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18411,7 +18411,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18463,7 +18463,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18520,7 +18520,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18572,7 +18572,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18629,7 +18629,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18681,7 +18681,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18738,7 +18738,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18790,7 +18790,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18847,7 +18847,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18899,7 +18899,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -18956,7 +18956,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19008,7 +19008,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19060,7 +19060,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19112,7 +19112,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19164,7 +19164,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19211,7 +19211,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19263,7 +19263,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19315,7 +19315,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19367,7 +19367,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19414,7 +19414,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19466,7 +19466,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19513,7 +19513,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19565,7 +19565,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19617,7 +19617,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19669,7 +19669,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19721,7 +19721,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19773,7 +19773,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19825,7 +19825,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19872,7 +19872,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19919,7 +19919,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -19966,7 +19966,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20013,7 +20013,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20060,7 +20060,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20107,7 +20107,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20154,7 +20154,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20201,7 +20201,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20248,7 +20248,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20295,7 +20295,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20342,7 +20342,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20389,7 +20389,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20436,7 +20436,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20483,7 +20483,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20530,7 +20530,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20577,7 +20577,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20624,7 +20624,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20671,7 +20671,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20718,7 +20718,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20765,7 +20765,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20812,7 +20812,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20859,7 +20859,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20906,7 +20906,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -20953,7 +20953,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21000,7 +21000,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21047,7 +21047,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21094,7 +21094,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21141,7 +21141,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21188,7 +21188,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21235,7 +21235,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21282,7 +21282,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21329,7 +21329,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21376,7 +21376,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21424,7 +21424,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21472,7 +21472,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21520,7 +21520,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21568,7 +21568,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21615,7 +21615,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21662,7 +21662,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21709,7 +21709,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21756,7 +21756,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21803,7 +21803,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21850,7 +21850,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21897,7 +21897,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21944,7 +21944,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -21991,7 +21991,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22038,7 +22038,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22085,7 +22085,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22132,7 +22132,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22179,7 +22179,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22226,7 +22226,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22273,7 +22273,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22320,7 +22320,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22367,7 +22367,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22414,7 +22414,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22461,7 +22461,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22508,7 +22508,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22555,7 +22555,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22602,7 +22602,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22649,7 +22649,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22696,7 +22696,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22743,7 +22743,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22790,7 +22790,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22837,7 +22837,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22884,7 +22884,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22931,7 +22931,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -22978,7 +22978,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23025,7 +23025,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23072,7 +23072,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23119,7 +23119,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23166,7 +23166,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23213,7 +23213,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23260,7 +23260,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23307,7 +23307,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23354,7 +23354,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23401,7 +23401,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23448,7 +23448,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", @@ -23495,7 +23495,7 @@ { "name": "skia/bots/skimage", "path": "skimage", - "version": "version:32" + "version": "version:33" }, { "name": "skia/bots/skp", diff --git a/src/codec/SkWebpCodec.cpp b/src/codec/SkWebpCodec.cpp index 6287617373..9cb44d275e 100644 --- a/src/codec/SkWebpCodec.cpp +++ b/src/codec/SkWebpCodec.cpp @@ -571,7 +571,6 @@ SkCodec::Result SkWebpCodec::onGetPixels(const SkImageInfo& dstInfo, void* dst, // We're only transforming the new part of the frame, so no need to worry about the // final composited alpha. const auto srcAlpha = 0 == index ? srcInfo.alphaType() : alpha_type(frame.has_alpha); - const auto xformAlphaType = select_xform_alpha(dstInfo.alphaType(), srcAlpha); const bool needsSrgbToLinear = dstInfo.gammaCloseToSRGB() && options.fPremulBehavior == SkTransferFunctionBehavior::kRespect; @@ -593,9 +592,9 @@ SkCodec::Result SkWebpCodec::onGetPixels(const SkImageInfo& dstInfo, void* dst, xformDst = dst; } for (int y = 0; y < rowsDecoded; y++) { - this->applyColorXform(xformDst, xformSrc, scaledWidth, xformAlphaType); + this->applyColorXform(xformDst, xformSrc, scaledWidth, srcAlpha); if (blendWithPrevFrame) { - blend_line(dstCT, dst, dstCT, xformDst, needsSrgbToLinear, xformAlphaType, + blend_line(dstCT, dst, dstCT, xformDst, needsSrgbToLinear, srcAlpha, scaledWidth); dst = SkTAddOffset<void>(dst, rowBytes); } else { @@ -608,7 +607,7 @@ SkCodec::Result SkWebpCodec::onGetPixels(const SkImageInfo& dstInfo, void* dst, for (int y = 0; y < rowsDecoded; y++) { blend_line(dstCT, dst, webpDst.colorType(), src, needsSrgbToLinear, - xformAlphaType, scaledWidth); + srcAlpha, scaledWidth); src = SkTAddOffset<const uint8_t>(src, srcRowBytes); dst = SkTAddOffset<void>(dst, rowBytes); } |