| Index: Source/core/platform/image-decoders/ImageDecoder.h
|
| diff --git a/Source/core/platform/image-decoders/ImageDecoder.h b/Source/core/platform/image-decoders/ImageDecoder.h
|
| index 24555cd522e6c34b7ecfcc9f9deef57f112f2393..d58cb9e7025b78897e7e138294272b3201b2da9e 100644
|
| --- a/Source/core/platform/image-decoders/ImageDecoder.h
|
| +++ b/Source/core/platform/image-decoders/ImageDecoder.h
|
| @@ -190,13 +190,11 @@ namespace WebCore {
|
|
|
| inline void setRGBAPremultiply(PixelData* dest, unsigned r, unsigned g, unsigned b, unsigned a)
|
| {
|
| - ASSERT(m_premultiplyAlpha);
|
| -
|
| - if (!a) {
|
| - *dest = 0;
|
| - return;
|
| - }
|
| if (a < 255) {
|
| + if (!a) {
|
| + *dest = 0;
|
| + return;
|
| + }
|
| unsigned alphaMult = a * fixPointMult;
|
| r = fixPointUnsignedMultiply(r, alphaMult);
|
| g = fixPointUnsignedMultiply(g, alphaMult);
|
| @@ -210,8 +208,6 @@ namespace WebCore {
|
|
|
| inline void setRGBARaw(PixelData* dest, unsigned r, unsigned g, unsigned b, unsigned a)
|
| {
|
| - ASSERT(!m_premultiplyAlpha);
|
| -
|
| *dest = SkPackARGB32NoCheck(a, r, g, b);
|
| }
|
|
|
|
|