diff options
author | Mike Reed <reed@google.com> | 2010-03-26 10:53:44 -0400 |
---|---|---|
committer | Mike Reed <reed@google.com> | 2010-03-26 10:53:44 -0400 |
commit | 07eb8b16917fcc2471346201df19e87900d3b9d3 (patch) | |
tree | 16db879931388485223e2e474a00636dc7991c9b /WebCore/platform | |
parent | deb08023e61ef15357d4ffda961ae9de873c45a0 (diff) | |
download | external_webkit-07eb8b16917fcc2471346201df19e87900d3b9d3.zip external_webkit-07eb8b16917fcc2471346201df19e87900d3b9d3.tar.gz external_webkit-07eb8b16917fcc2471346201df19e87900d3b9d3.tar.bz2 |
correct rgba order for skia
Change-Id: I9814bfbffe595d8c3fdd845160df33d60138d081
Diffstat (limited to 'WebCore/platform')
-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 } } |