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

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 194e50ba14a2a829d0799a6fb3a7d0b72df2a373
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 17:34:14 2010 +0000

    2010-11-19  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] mask-box-image renders wrong in certain conditions
            https://bugs.webkit.org/show_bug.cgi?id=43476
    
            When rendering a pixmap with a dest rect having a null dimension,
            Qt uses the dimension of the Pixmap. The other ports do not render
            anything by convention.
    
            This patch change BitmapImage to follow the convention of other ports and do not
            paint anything.
    
            * platform/graphics/qt/ImageQt.cpp:
            (WebCore::BitmapImage::draw):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72412 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 53141ec..80883d4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-19  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] mask-box-image renders wrong in certain conditions
+        https://bugs.webkit.org/show_bug.cgi?id=43476
+
+        When rendering a pixmap with a dest rect having a null dimension,
+        Qt uses the dimension of the Pixmap. The other ports do not render
+        anything by convention.
+
+        This patch change BitmapImage to follow the convention of other ports and do not
+        paint anything.
+
+        * platform/graphics/qt/ImageQt.cpp:
+        (WebCore::BitmapImage::draw):
+
 2010-11-19  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/platform/graphics/qt/ImageQt.cpp b/WebCore/platform/graphics/qt/ImageQt.cpp
index 7b46b71..26179ad 100644
--- a/WebCore/platform/graphics/qt/ImageQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageQt.cpp
@@ -182,6 +182,9 @@ void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst,
 
     startAnimation();
 
+    if (normalizedSrc.isEmpty() || normalizedDst.isEmpty())
+        return;
+
     QPixmap* image = nativeImageForCurrentFrame();
     if (!image)
         return;

-- 
WebKit Debian packaging