[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9dafe92805df0684766af2821916651e6f04a066
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 12 10:20:57 2009 +0000

    2009-12-12  Dirk Schulze  <krit at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [Cairo][Qt] Alpha blending in SVG filters is wrong
            https://bugs.webkit.org/show_bug.cgi?id=32427
    
            This patch is a follow-up to:
            http://trac.webkit.org/changeset/51950
            It fixes the alpha blending for Cairo and Qt on SVG Filters.
    
            Covered by: * LayoutTests/svg/filters/feGaussianBlur.svg
                        * LayoutTests/svg/filters/feComposite.svg
                         and others.
    
            * platform/graphics/cairo/ImageBufferCairo.cpp:
            (WebCore::ImageBuffer::platformTransformColorSpace):
            * platform/graphics/qt/ImageBufferQt.cpp:
            (WebCore::ImageBuffer::platformTransformColorSpace):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52049 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 22fcd0f..84483e0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2009-12-12  Dirk Schulze  <krit at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [Cairo][Qt] Alpha blending in SVG filters is wrong
+        https://bugs.webkit.org/show_bug.cgi?id=32427
+
+        This patch is a follow-up to:
+        http://trac.webkit.org/changeset/51950
+        It fixes the alpha blending for Cairo and Qt on SVG Filters.
+
+        Covered by: * LayoutTests/svg/filters/feGaussianBlur.svg
+                    * LayoutTests/svg/filters/feComposite.svg
+                     and others.
+
+        * platform/graphics/cairo/ImageBufferCairo.cpp:
+        (WebCore::ImageBuffer::platformTransformColorSpace):
+        * platform/graphics/qt/ImageBufferQt.cpp:
+        (WebCore::ImageBuffer::platformTransformColorSpace):
+
 2009-12-11  Eric Roman  <eroman at chromium.org>
 
         Unreviewed build fix.
diff --git a/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp b/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
index d991c80..124c7cf 100644
--- a/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
+++ b/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
@@ -132,7 +132,7 @@ void ImageBuffer::platformTransformColorSpace(const Vector<int>& lookUpTable)
             pixelColor = Color(lookUpTable[pixelColor.red()],
                                lookUpTable[pixelColor.green()],
                                lookUpTable[pixelColor.blue()],
-                               lookUpTable[pixelColor.alpha()]);
+                               pixelColor.alpha());
             *pixel = premultipliedARGBFromColor(pixelColor);
         }
     }
diff --git a/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
index 5255428..d831566 100644
--- a/WebCore/platform/graphics/qt/ImageBufferQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
@@ -114,7 +114,7 @@ void ImageBuffer::platformTransformColorSpace(const Vector<int>& lookUpTable)
             value = qRgba(lookUpTable[qRed(value)],
                           lookUpTable[qGreen(value)],
                           lookUpTable[qBlue(value)],
-                          lookUpTable[qAlpha(value)]);
+                          qAlpha(value));
             image.setPixel(x, y, value);
         }
     }

-- 
WebKit Debian packaging