From 3983c1de0a42b77648fc30d85f25496c772c148f Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Fri, 19 Nov 2010 14:12:47 -0800 Subject: [PATCH] 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 --- WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index fa500d064..728ea3516 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); -- 2.11.0