2010-07-19 Andreas Kling <andreas.kling@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@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:


Canonical link: https://commits.webkit.org/54497@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63657 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

@@ -1,3 +1,20 @@
+2010-07-19  Andreas Kling  <andreas.kling@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:
+
 2010-07-19  Andreas Kling  <andreas.kling@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.

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

WebCore/ChangeLog

@@ -1,3 +1,15 @@
+2010-07-19  Andreas Kling  <andreas.kling@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@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.

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);
     }

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);
     }