diff options
| author | Steve Block <steveblock@google.com> | 2010-08-27 12:40:23 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:20 +0100 |
| commit | 95584b8973cc39a1cbed21e378571c878b7acf6d (patch) | |
| tree | 4230c2271943bba2ef52da48552dc136febc55fa /WebCore/platform | |
| parent | 96e7472938b0a8f5ddbb99a17bdbb29c49a519c2 (diff) | |
| download | external_webkit-95584b8973cc39a1cbed21e378571c878b7acf6d.zip external_webkit-95584b8973cc39a1cbed21e378571c878b7acf6d.tar.gz external_webkit-95584b8973cc39a1cbed21e378571c878b7acf6d.tar.bz2 | |
Merge WebKit at r66079 : ImageSource constructor now takes a premultipyAlpha argument
See http://trac.webkit.org/changeset/66039
Change-Id: I4961f5610c3061c90edf8cc32b83e4a6b8be12d1
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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); |