[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit f832a5ed267b8f710825b7bf15361efebaf8877a
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 22:07:46 2010 +0000

    2010-07-27  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] putImageData(): Fast premultiply() if alpha == 255
    
            * platform/graphics/qt/ImageBufferQt.cpp:
            (WebCore::premultiply): Do nothing for opaque pixels.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 188b289..b33e1fa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-27  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] putImageData(): Fast premultiply() if alpha == 255
+
+        * platform/graphics/qt/ImageBufferQt.cpp:
+        (WebCore::premultiply): Do nothing for opaque pixels.
+
 2010-07-27  Jian Li  <jianli at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
index bd272db..e0e2de6 100644
--- a/WebCore/platform/graphics/qt/ImageBufferQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
@@ -240,6 +240,8 @@ PassRefPtr<ImageData> ImageBuffer::getPremultipliedImageData(const IntRect& rect
 static inline unsigned int premultiply(unsigned int x)
 {
     unsigned int a = x >> 24;
+    if (a == 255)
+        return x;
     unsigned int t = (x & 0xff00ff) * a;
     t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8;
     t &= 0xff00ff;

-- 
WebKit Debian packaging