[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andreas.kling at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit ff7f5455358b9e031dad1d6a0b1cff4b8a17e10b
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 17:49:10 2011 +0000

    2011-01-20  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] Fill shadow scratch buffer with proper transparent pixels
    
            QImage::fill() has no Qt::GlobalColor overload in Qt 4.7 (coming in 4.8)
            so doing QImage::fill(Qt::transparent) will actually fill all pixels with
            the RGBA value 0x00000013.
    
            * platform/graphics/qt/ContextShadowQt.cpp:
            (WebCore::ShadowBuffer::scratchImage):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76260 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 35fb363..6cf0d53 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-20  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Fill shadow scratch buffer with proper transparent pixels
+
+        QImage::fill() has no Qt::GlobalColor overload in Qt 4.7 (coming in 4.8)
+        so doing QImage::fill(Qt::transparent) will actually fill all pixels with
+        the RGBA value 0x00000013.
+
+        * platform/graphics/qt/ContextShadowQt.cpp:
+        (WebCore::ShadowBuffer::scratchImage):
+
 2011-01-19  Adam Roben  <aroben at apple.com>
 
         Remove WKCACFContextFlusher
diff --git a/Source/WebCore/platform/graphics/qt/ContextShadowQt.cpp b/Source/WebCore/platform/graphics/qt/ContextShadowQt.cpp
index 834ca62..37d6b44 100644
--- a/Source/WebCore/platform/graphics/qt/ContextShadowQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/ContextShadowQt.cpp
@@ -72,7 +72,7 @@ QImage* ShadowBuffer::scratchImage(const QSize& size)
     // keep too many allocated pixels for too long.
     if (!image.isNull() && (image.width() > width) && (image.height() > height))
         if (((2 * width) > image.width()) && ((2 * height) > image.height())) {
-            image.fill(Qt::transparent);
+            image.fill(0);
             return &image;
         }
 
@@ -82,7 +82,7 @@ QImage* ShadowBuffer::scratchImage(const QSize& size)
     height = (1 + (height >> 5)) << 5;
 
     image = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
-    image.fill(Qt::transparent);
+    image.fill(0);
     return &image;
 }
 

-- 
WebKit Debian packaging