diff options
| author | Cary Clark <cary@android.com> | 2010-03-30 10:25:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-30 10:25:34 -0700 |
| commit | 15a662df5e0c0c067fd6de1feeddb5fd04f283df (patch) | |
| tree | 69851fb308d908c70ddf5af95b7881a582f494e4 /WebCore/platform | |
| parent | 4b7d2805ff99aafc2fbcdd38cd9a505f99847bd8 (diff) | |
| parent | f70790d5b17f0fec736579b53f08ab248f08d188 (diff) | |
| download | external_webkit-15a662df5e0c0c067fd6de1feeddb5fd04f283df.zip external_webkit-15a662df5e0c0c067fd6de1feeddb5fd04f283df.tar.gz external_webkit-15a662df5e0c0c067fd6de1feeddb5fd04f283df.tar.bz2 | |
Merge "correct rgba order for skia" into froyo
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 } } |