diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
| tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebCore/platform/image-decoders/ImageDecoder.h | |
| parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
| download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 | |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebCore/platform/image-decoders/ImageDecoder.h')
| -rw-r--r-- | WebCore/platform/image-decoders/ImageDecoder.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/platform/image-decoders/ImageDecoder.h b/WebCore/platform/image-decoders/ImageDecoder.h index 81d6dbb..4b593f9 100644 --- a/WebCore/platform/image-decoders/ImageDecoder.h +++ b/WebCore/platform/image-decoders/ImageDecoder.h @@ -151,7 +151,7 @@ namespace WebCore { #endif private: -#if PLATFORM(CF) +#if PLATFORM(CG) typedef RetainPtr<CFMutableDataRef> NativeBackingStore; #else typedef Vector<PixelData> NativeBackingStore; @@ -233,9 +233,10 @@ namespace WebCore { // m_maxNumPixels. (Not supported by all image decoders yet) class ImageDecoder : public Noncopyable { public: - ImageDecoder(bool premultiplyAlpha) + ImageDecoder(bool premultiplyAlpha, bool ignoreGammaAndColorProfile) : m_scaled(false) , m_premultiplyAlpha(premultiplyAlpha) + , m_ignoreGammaAndColorProfile(ignoreGammaAndColorProfile) , m_sizeAvailable(false) , m_maxNumPixels(-1) , m_isAllDataReceived(false) @@ -248,7 +249,7 @@ namespace WebCore { // Factory function to create an ImageDecoder. Ports that subclass // ImageDecoder can provide their own implementation of this to avoid // needing to write a dedicated setData() implementation. - static ImageDecoder* create(const SharedBuffer& data, bool premultiplyAlpha); + static ImageDecoder* create(const SharedBuffer& data, bool premultiplyAlpha, bool ignoreGammaAndColorProfile); // The the filename extension usually associated with an undecoded image // of this type. @@ -364,6 +365,7 @@ namespace WebCore { Vector<int> m_scaledColumns; Vector<int> m_scaledRows; bool m_premultiplyAlpha; + bool m_ignoreGammaAndColorProfile; private: // Some code paths compute the size of the image as "width * height * 4" |