[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 e60f0595c71f6878e44cbf0da1ead967572da506
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 17:45:51 2010 +0000

    2010-10-14  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] Avoid creating empty transparency layers in ImageBuffer::clip()
    
            We were creating empty layers for sub-1 height/width clips due to
            using IntRect(FloatRect) instead of enclosingIntRect().
            This lead to a bunch of QPainter warnings on the console since you
            can't draw on an empty QPixmap.
    
            * platform/graphics/qt/ImageBufferQt.cpp:
            (WebCore::ImageBuffer::clip):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69779 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2ca30c7..37b666a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-14  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Avoid creating empty transparency layers in ImageBuffer::clip()
+
+        We were creating empty layers for sub-1 height/width clips due to
+        using IntRect(FloatRect) instead of enclosingIntRect().
+        This lead to a bunch of QPainter warnings on the console since you
+        can't draw on an empty QPixmap.
+
+        * platform/graphics/qt/ImageBufferQt.cpp:
+        (WebCore::ImageBuffer::clip):
+
 2010-10-14  Holger Hans Peter Freyther  <holger at moiji-mobile.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
index ee01222..5c190b3 100644
--- a/WebCore/platform/graphics/qt/ImageBufferQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageBufferQt.cpp
@@ -139,7 +139,7 @@ void ImageBuffer::clip(GraphicsContext* context, const FloatRect& floatRect) con
     if (!nativeImage)
         return;
 
-    IntRect rect(floatRect);
+    IntRect rect = enclosingIntRect(floatRect);
     QPixmap alphaMask = *nativeImage;
     if (alphaMask.width() != rect.width() || alphaMask.height() != rect.height())
         alphaMask = alphaMask.scaled(rect.width(), rect.height());

-- 
WebKit Debian packaging