summaryrefslogtreecommitdiffstats
path: root/gfx/codec/jpeg_codec.h
diff options
context:
space:
mode:
authorklobag@chromium.org <klobag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 17:18:11 +0000
committerklobag@chromium.org <klobag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 17:18:11 +0000
commit7fac41ba05f8b0c812219b690049d8eb56ab72d6 (patch)
treea1720f9b141e1e27a8bb0c2eeffc1246bab00fef /gfx/codec/jpeg_codec.h
parent4a921153c5a3aefedb3b148933cf80a51b0aec14 (diff)
downloadchromium_src-7fac41ba05f8b0c812219b690049d8eb56ab72d6.zip
chromium_src-7fac41ba05f8b0c812219b690049d8eb56ab72d6.tar.gz
chromium_src-7fac41ba05f8b0c812219b690049d8eb56ab72d6.tar.bz2
Add FORMAT_SkBitmap to JPEGCodec.
When encoding or decoding JPEG to SkBitmap, choose RGBA or BGRA depending on the skia bitmap's bit order. Review URL: http://codereview.chromium.org/3806010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/codec/jpeg_codec.h')
-rw-r--r--gfx/codec/jpeg_codec.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/gfx/codec/jpeg_codec.h b/gfx/codec/jpeg_codec.h
index bc4d31e..5c47b1a 100644
--- a/gfx/codec/jpeg_codec.h
+++ b/gfx/codec/jpeg_codec.h
@@ -28,7 +28,11 @@ class JPEGCodec {
// 4 bytes per pixel, in BGRA order in mem regardless of endianness.
// This is the default Windows DIB order.
- FORMAT_BGRA
+ FORMAT_BGRA,
+
+ // 4 bytes per pixel, it can be either RGBA or BGRA. It depends on the bit
+ // order in kARGB_8888_Config skia bitmap.
+ FORMAT_SkBitmap
};
// Encodes the given raw 'input' data, with each pixel being represented as