gfx/skia/patches/0022-Bug-848491-Re-apply-bug-795538-Ensure-we-use-the-cor.patch@b8a032363ba2 (annotated)
gfx/skia/patches/0022-Bug-848491-Re-apply-bug-795538-Ensure-we-use-the-cor.patch
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
| michael@0 | 1 | From: George Wright <gwright@mozilla.com> |
| michael@0 | 2 | Date: Thu, 20 Jun 2013 09:21:21 -0400 |
| michael@0 | 3 | Subject: Bug 848491 - Re-apply bug 795538 - Ensure we use the correct colour (and alpha) for the clamp values r=mattwoodrow |
| michael@0 | 4 | |
| michael@0 | 5 | |
| michael@0 | 6 | diff --git a/gfx/skia/src/effects/gradients/SkGradientShader.cpp b/gfx/skia/src/effects/gradients/SkGradientShader.cpp |
| michael@0 | 7 | index 27a9c46..ce077b5 100644 |
| michael@0 | 8 | --- a/gfx/skia/src/effects/gradients/SkGradientShader.cpp |
| michael@0 | 9 | +++ b/gfx/skia/src/effects/gradients/SkGradientShader.cpp |
| michael@0 | 10 | @@ -500,15 +500,17 @@ const SkPMColor* SkGradientShaderBase::getCache32() const { |
| michael@0 | 11 | } |
| michael@0 | 12 | |
| michael@0 | 13 | // Write the clamp colours into the first and last entries of fCache32 |
| michael@0 | 14 | - fCache32[kCache32ClampLower] = SkPackARGB32(fCacheAlpha, |
| michael@0 | 15 | - SkColorGetR(fOrigColors[0]), |
| michael@0 | 16 | - SkColorGetG(fOrigColors[0]), |
| michael@0 | 17 | - SkColorGetB(fOrigColors[0])); |
| michael@0 | 18 | - |
| michael@0 | 19 | - fCache32[kCache32ClampUpper] = SkPackARGB32(fCacheAlpha, |
| michael@0 | 20 | - SkColorGetR(fOrigColors[fColorCount - 1]), |
| michael@0 | 21 | - SkColorGetG(fOrigColors[fColorCount - 1]), |
| michael@0 | 22 | - SkColorGetB(fOrigColors[fColorCount - 1])); |
| michael@0 | 23 | + fCache32[kCache32ClampLower] = SkPremultiplyARGBInline(SkMulDiv255Round(SkColorGetA(fOrigColors[0]), |
| michael@0 | 24 | + fCacheAlpha), |
| michael@0 | 25 | + SkColorGetR(fOrigColors[0]), |
| michael@0 | 26 | + SkColorGetG(fOrigColors[0]), |
| michael@0 | 27 | + SkColorGetB(fOrigColors[0])); |
| michael@0 | 28 | + |
| michael@0 | 29 | + fCache32[kCache32ClampUpper] = SkPremultiplyARGBInline(SkMulDiv255Round(SkColorGetA(fOrigColors[fColorCount - 1]), |
| michael@0 | 30 | + fCacheAlpha), |
| michael@0 | 31 | + SkColorGetR(fOrigColors[fColorCount - 1]), |
| michael@0 | 32 | + SkColorGetG(fOrigColors[fColorCount - 1]), |
| michael@0 | 33 | + SkColorGetB(fOrigColors[fColorCount - 1])); |
| michael@0 | 34 | |
| michael@0 | 35 | return fCache32; |
| michael@0 | 36 | } |
| michael@0 | 37 | -- |
| michael@0 | 38 | 1.7.11.7 |
| michael@0 | 39 |
