Changeset 63657 in webkit

Timestamp:

Jul 19, 2010 7:27:56 AM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/ImageQt.cpp (modified) (1 diff)
• WebCore/platform/graphics/qt/StillImageQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5288 +5288 @@
 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

trunk/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/WebCore/platform/graphics/qt/ImageQt.cpp

@@ -203 +203 @@
         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);

trunk/WebCore/platform/graphics/qt/StillImageQt.cpp

@@ -89 +89 @@
         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);