From 95584b8973cc39a1cbed21e378571c878b7acf6d Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 27 Aug 2010 12:40:23 +0100 Subject: Merge WebKit at r66079 : ImageSource constructor now takes a premultipyAlpha argument See http://trac.webkit.org/changeset/66039 Change-Id: I4961f5610c3061c90edf8cc32b83e4a6b8be12d1 --- WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'WebCore/platform') diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index 1212ff9..fa500d0 100644 --- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp @@ -130,7 +130,9 @@ public: namespace WebCore { -ImageSource::ImageSource() { +ImageSource::ImageSource(bool premultiplyAlpha) + : m_premultiplyAlpha(premultiplyAlpha) +{ m_decoder.m_image = NULL; #ifdef ANDROID_ANIMATED_GIF m_decoder.m_gifDecoder = 0; @@ -271,7 +273,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_decoder.m_gifDecoder = new GIFImageDecoder(m_premultiplyAlpha); int frameCount = 0; if (!m_decoder.m_gifDecoder->failed()) { m_decoder.m_gifDecoder->setData(data, allDataReceived); -- cgit v1.1