diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-19 14:12:47 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 3983c1de0a42b77648fc30d85f25496c772c148f (patch) | |
| tree | 5b24651702f6e089e4265d35f2cf27dec75a3bf0 /WebCore/platform/graphics/android/ImageSourceAndroid.cpp | |
| parent | 5144992c32630d3a9d1af0171204232d5d6eb442 (diff) | |
| download | external_webkit-3983c1de0a42b77648fc30d85f25496c772c148f.zip external_webkit-3983c1de0a42b77648fc30d85f25496c772c148f.tar.gz external_webkit-3983c1de0a42b77648fc30d85f25496c772c148f.tar.bz2 | |
Merge WebKit at r72274: Add new flag to ImageSource constructor with asssociated storage member
Patch for webkit change:
http://trac.webkit.org/changeset/72130
Change-Id: I5718b8c1ee5b2a9c8afa31de24e882f30d62972f
Diffstat (limited to 'WebCore/platform/graphics/android/ImageSourceAndroid.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index fa500d0..728ea35 100644 --- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp @@ -130,8 +130,9 @@ public: namespace WebCore { -ImageSource::ImageSource(bool premultiplyAlpha) +ImageSource::ImageSource(bool premultiplyAlpha, bool ignoreGammaAndColorProfile) : m_premultiplyAlpha(premultiplyAlpha) + , m_ignoreGammaAndColorProfile(ignoreGammaAndColorProfile) { m_decoder.m_image = NULL; #ifdef ANDROID_ANIMATED_GIF @@ -273,7 +274,7 @@ void ImageSource::setData(SharedBuffer* data, bool allDataReceived) // Need to wait for all data received if we are assigning an // allocator (which we are not at the moment). if (!m_decoder.m_gifDecoder /*&& allDataReceived*/) - m_decoder.m_gifDecoder = new GIFImageDecoder(m_premultiplyAlpha); + m_decoder.m_gifDecoder = new GIFImageDecoder(m_premultiplyAlpha, m_ignoreGammaAndColorProfile); int frameCount = 0; if (!m_decoder.m_gifDecoder->failed()) { m_decoder.m_gifDecoder->setData(data, allDataReceived); |