[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 bb2c8740cd79086aedeba5e6a1f800f7dad9d137
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 14:27:56 2010 +0000

    2010-07-19  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Canvas: Wrong internal positioning of drawImage() shadows
            https://bugs.webkit.org/show_bug.cgi?id=42510
    
            * platform/graphics/qt/ImageQt.cpp:
            (WebCore::BitmapImage::draw):
            * platform/graphics/qt/StillImageQt.cpp:
            (WebCore::StillImage::draw):
    2010-07-19  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Canvas: Wrong internal positioning of drawImage() shadows
            https://bugs.webkit.org/show_bug.cgi?id=42510
    
            Unskip:
            - canvas/philip/tests/2d.shadow.canvas.alpha.html
            - canvas/philip/tests/2d.shadow.canvas.transparent.1.html
            - canvas/philip/tests/2d.shadow.canvas.transparent.2.html
            - canvas/philip/tests/2d.shadow.image.alpha.html
            - canvas/philip/tests/2d.shadow.image.transparent.1.html
            - canvas/philip/tests/2d.shadow.image.transparent.2.html
    
            * platform/qt/Skipped:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63657 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9e318a0..eb352d2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,23 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [Qt] Canvas: Wrong internal positioning of drawImage() shadows
+        https://bugs.webkit.org/show_bug.cgi?id=42510
+
+        Unskip:
+        - canvas/philip/tests/2d.shadow.canvas.alpha.html
+        - canvas/philip/tests/2d.shadow.canvas.transparent.1.html
+        - canvas/philip/tests/2d.shadow.canvas.transparent.2.html
+        - canvas/philip/tests/2d.shadow.image.alpha.html
+        - canvas/philip/tests/2d.shadow.image.transparent.1.html
+        - canvas/philip/tests/2d.shadow.image.transparent.2.html
+
+        * platform/qt/Skipped:
+
+2010-07-19  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         [Qt] Render shadow when drawing one canvas onto another
         https://bugs.webkit.org/show_bug.cgi?id=42508
 
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 9c10590..3e4379a 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5287,12 +5287,6 @@ canvas/philip/tests/2d.pattern.image.broken.html
 canvas/philip/tests/2d.pattern.image.incomplete.html
 canvas/philip/tests/2d.pattern.image.null.html
 canvas/philip/tests/2d.pattern.image.undefined.html
-canvas/philip/tests/2d.shadow.canvas.alpha.html
-canvas/philip/tests/2d.shadow.canvas.transparent.1.html
-canvas/philip/tests/2d.shadow.canvas.transparent.2.html
-canvas/philip/tests/2d.shadow.image.alpha.html
-canvas/philip/tests/2d.shadow.image.transparent.1.html
-canvas/philip/tests/2d.shadow.image.transparent.2.html
 canvas/philip/tests/2d.shadow.transform.2.html
 canvas/philip/tests/2d.text.draw.baseline.bottom.html
 canvas/philip/tests/2d.text.draw.baseline.hanging.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e3373fe..8b872d4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [Qt] Canvas: Wrong internal positioning of drawImage() shadows
+        https://bugs.webkit.org/show_bug.cgi?id=42510
+
+        * platform/graphics/qt/ImageQt.cpp:
+        (WebCore::BitmapImage::draw):
+        * platform/graphics/qt/StillImageQt.cpp:
+        (WebCore::StillImage::draw):
+
+2010-07-19  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         [Qt] Render shadow when drawing one canvas onto another
         https://bugs.webkit.org/show_bug.cgi?id=42508
 
diff --git a/WebCore/platform/graphics/qt/ImageQt.cpp b/WebCore/platform/graphics/qt/ImageQt.cpp
index ea80487..e0ac574 100644
--- a/WebCore/platform/graphics/qt/ImageQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageQt.cpp
@@ -202,7 +202,7 @@ void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst,
         p.setCompositionMode(QPainter::CompositionMode_Source);
         p.fillRect(shadowImage.rect(), shadowColor);
         p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
-        p.drawPixmap(normalizedDst, *image, normalizedSrc);
+        p.drawPixmap(QRect(0, 0, normalizedDst.width(), normalizedDst.height()), *image, normalizedSrc);
         p.end();
         painter->drawImage(shadowImageRect, shadowImage, normalizedSrc);
     }
diff --git a/WebCore/platform/graphics/qt/StillImageQt.cpp b/WebCore/platform/graphics/qt/StillImageQt.cpp
index a85d41e..9c6acab 100644
--- a/WebCore/platform/graphics/qt/StillImageQt.cpp
+++ b/WebCore/platform/graphics/qt/StillImageQt.cpp
@@ -88,7 +88,7 @@ void StillImage::draw(GraphicsContext* ctxt, const FloatRect& dst,
         p.setCompositionMode(QPainter::CompositionMode_Source);
         p.fillRect(shadowImage.rect(), shadowColor);
         p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
-        p.drawPixmap(normalizedDst, *m_pixmap, normalizedSrc);
+        p.drawPixmap(QRect(0, 0, normalizedDst.width(), normalizedDst.height()), *m_pixmap, normalizedSrc);
         p.end();
         painter->drawImage(shadowImageRect, shadowImage, normalizedSrc);
     }

-- 
WebKit Debian packaging