| Index: Source/core/platform/image-decoders/png/PNGImageDecoder.cpp
|
| diff --git a/Source/core/platform/image-decoders/png/PNGImageDecoder.cpp b/Source/core/platform/image-decoders/png/PNGImageDecoder.cpp
|
| index 828328b956c2bb0c8d8d8de534228c2abee60223..4da0ebac7d8ef709facf55bd7c73f95dc6c97a6f 100644
|
| --- a/Source/core/platform/image-decoders/png/PNGImageDecoder.cpp
|
| +++ b/Source/core/platform/image-decoders/png/PNGImageDecoder.cpp
|
| @@ -489,18 +489,29 @@ void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer, unsigned rowIndex,
|
|
|
| // Write the decoded row pixels to the frame buffer.
|
| ImageFrame::PixelData* address = buffer.getAddr(0, y);
|
| - bool nonTrivialAlpha = false;
|
| + unsigned alphaMask = 255;
|
| int width = size().width();
|
|
|
| png_bytep pixel = row;
|
| - for (int x = 0; x < width; ++x, pixel += colorChannels) {
|
| - unsigned alpha = hasAlpha ? pixel[3] : 255;
|
| - buffer.setRGBA(address++, pixel[0], pixel[1], pixel[2], alpha);
|
| - nonTrivialAlpha |= alpha < 255;
|
| + if (hasAlpha) {
|
| + if (buffer.premultiplyAlpha()) {
|
| + for (int x = 0; x < width; ++x, pixel += 4) {
|
| + buffer.setRGBAPremultiply(address++, pixel[0], pixel[1], pixel[2], pixel[3]);
|
| + alphaMask &= pixel[3];
|
| + }
|
| + } else {
|
| + for (int x = 0; x < width; ++x, pixel += 4) {
|
| + buffer.setRGBARaw(address++, pixel[0], pixel[1], pixel[2], pixel[3]);
|
| + alphaMask &= pixel[3];
|
| + }
|
| + }
|
| + } else {
|
| + for (int x = 0; x < width; ++x, pixel += 3)
|
| + buffer.setRGBARaw(address++, pixel[0], pixel[1], pixel[2], 255);
|
| }
|
|
|
| - if (nonTrivialAlpha && !buffer.hasAlpha())
|
| - buffer.setHasAlpha(nonTrivialAlpha);
|
| + if (alphaMask != 255 && !buffer.hasAlpha())
|
| + buffer.setHasAlpha(true);
|
| }
|
|
|
| void PNGImageDecoder::pngComplete()
|
|
|