diff options
| author | amanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 01:01:52 +0000 |
|---|---|---|
| committer | amanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 01:01:52 +0000 |
| commit | 8860e4f513e757810afecfb62a2bd282cd731ed9 (patch) | |
| tree | a1905994c55ee794c1e4d3e450ba009f8d5f65f1 /skia/config | |
| parent | 2d896aedfc2630ee7a7c973e84d69f5099104767 (diff) | |
| download | chromium_src-8860e4f513e757810afecfb62a2bd282cd731ed9.zip chromium_src-8860e4f513e757810afecfb62a2bd282cd731ed9.tar.gz chromium_src-8860e4f513e757810afecfb62a2bd282cd731ed9.tar.bz2 | |
Update WebKit to 45111 and Skia to 239
Review URL: http://codereview.chromium.org/147121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/config')
| -rw-r--r-- | skia/config/SkUserConfig.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index f9ba042..09c99f0 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -166,11 +166,15 @@ typedef unsigned uint32_t; #define SK_CPU_LENDIAN #undef SK_CPU_BENDIAN -// we want (memory order) RGBA +// we want (memory order) BGRA, because that's what core image uses with +// kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, which is what +// Apple recommends for best performance (ARGB becomes BGRA in memory on +// little-endian) -- and we want skia and coregraphic to have matching memory +// layouts, so that we don't have to spend time converting between them. #define SK_A32_SHIFT 24 -#define SK_R32_SHIFT 0 +#define SK_R32_SHIFT 16 #define SK_G32_SHIFT 8 -#define SK_B32_SHIFT 16 +#define SK_B32_SHIFT 0 #elif defined(SK_BUILD_FOR_UNIX) |