diff options
| author | Mike Reed <reed@google.com> | 2010-03-26 10:53:44 -0400 |
|---|---|---|
| committer | Cary Clark <cary@android.com> | 2010-03-30 13:13:51 -0400 |
| commit | f70790d5b17f0fec736579b53f08ab248f08d188 (patch) | |
| tree | f409b1f05f5cc0bfb49c492807695fdba613a6db | |
| parent | 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 (diff) | |
| download | external_webkit-f70790d5b17f0fec736579b53f08ab248f08d188.zip external_webkit-f70790d5b17f0fec736579b53f08ab248f08d188.tar.gz external_webkit-f70790d5b17f0fec736579b53f08ab248f08d188.tar.bz2 | |
correct rgba order for skia
Change-Id: I368def139ab2b3c5c08807919152ca7379ab9b4f
http://b/1745918
| -rw-r--r-- | WebCore/platform/image-decoders/ImageDecoder.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/platform/image-decoders/ImageDecoder.h b/WebCore/platform/image-decoders/ImageDecoder.h index 3ca7abf..8d27072 100644 --- a/WebCore/platform/image-decoders/ImageDecoder.h +++ b/WebCore/platform/image-decoders/ImageDecoder.h @@ -39,6 +39,7 @@ #if PLATFORM(SKIA) #include "NativeImageSkia.h" +#include "SkColorPriv.h" #elif PLATFORM(QT) #include <QImage> #endif @@ -169,7 +170,11 @@ namespace WebCore { g = static_cast<unsigned>(g * alphaPercent); b = static_cast<unsigned>(b * alphaPercent); } +#if PLATFORM(ANDROID) + *dest = SkPackARGB32(a, r, g, b); +#else *dest = (a << 24 | r << 16 | g << 8 | b); +#endif } } |