Changeset 76206 in webkit

Timestamp:

Jan 19, 2011 9:57:51 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-19 Helder Correia <​helder@sencha.com>

Reviewed by Andreas Kling.

[Qt] GraphicsContext::strokePath() paints solid shadows with incorrect alpha
​https://bugs.webkit.org/show_bug.cgi?id=52705

This is related to bug 52611. The shadow color alpha must be multiplied
by the context pen alpha. Fixing this results in correct behavior for
Canvas path stroke() and strokeRect() [which relies on stroke()].

• fast/canvas/canvas-strokePath-alpha-shadow-expected.txt: Added.
• fast/canvas/canvas-strokePath-alpha-shadow.html: Added.
• fast/canvas/canvas-strokeRect-alpha-shadow-expected.txt: Added.
• fast/canvas/canvas-strokeRect-alpha-shadow.html: Added.
• fast/canvas/script-tests/canvas-strokePath-alpha-shadow.js: Added.
• fast/canvas/script-tests/canvas-strokeRect-alpha-shadow.js: Added.

2011-01-19 Helder Correia <​helder@sencha.com>

Reviewed by Andreas Kling.

[Qt] GraphicsContext::strokePath() paints solid shadows with incorrect alpha
​https://bugs.webkit.org/show_bug.cgi?id=52705

This is related to bug 52611. The shadow color alpha must be multiplied
by the context pen alpha. Fixing this results in correct behavior for
Canvas path stroke() and strokeRect() [which relies on stroke()].

Tests: fast/canvas/canvas-strokePath-alpha-shadow.html

fast/canvas/canvas-strokeRect-alpha-shadow.html

• platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContext::strokePath):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-strokePath-alpha-shadow-expected.txt (added)
• LayoutTests/fast/canvas/canvas-strokePath-alpha-shadow.html (added)
• LayoutTests/fast/canvas/canvas-strokeRect-alpha-shadow-expected.txt (added)
• LayoutTests/fast/canvas/canvas-strokeRect-alpha-shadow.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-strokePath-alpha-shadow.js (added)
• LayoutTests/fast/canvas/script-tests/canvas-strokeRect-alpha-shadow.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-19  Helder Correia  <helder@sencha.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] GraphicsContext::strokePath() paints solid shadows with incorrect alpha
+        https://bugs.webkit.org/show_bug.cgi?id=52705
+
+        This is related to bug 52611. The shadow color alpha must be multiplied
+        by the context pen alpha. Fixing this results in correct behavior for
+        Canvas path stroke() and strokeRect() [which relies on stroke()].
+
+        * fast/canvas/canvas-strokePath-alpha-shadow-expected.txt: Added.
+        * fast/canvas/canvas-strokePath-alpha-shadow.html: Added.
+        * fast/canvas/canvas-strokeRect-alpha-shadow-expected.txt: Added.
+        * fast/canvas/canvas-strokeRect-alpha-shadow.html: Added.
+        * fast/canvas/script-tests/canvas-strokePath-alpha-shadow.js: Added.
+        * fast/canvas/script-tests/canvas-strokeRect-alpha-shadow.js: Added.
+
 2011-01-14  Darin Fisher  <darin@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-19  Helder Correia  <helder@sencha.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] GraphicsContext::strokePath() paints solid shadows with incorrect alpha
+        https://bugs.webkit.org/show_bug.cgi?id=52705
+
+        This is related to bug 52611. The shadow color alpha must be multiplied
+        by the context pen alpha. Fixing this results in correct behavior for
+        Canvas path stroke() and strokeRect() [which relies on stroke()].
+
+        Tests: fast/canvas/canvas-strokePath-alpha-shadow.html
+               fast/canvas/canvas-strokeRect-alpha-shadow.html
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::strokePath):
+
 2011-01-19  Darin Fisher  <darin@chromium.org>
 

trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -556 +556 @@
             }
         } else {
-            QPen shadowPen(pen);
-            shadowPen.setColor(m_data->shadow.m_color);
             QPointF offset = shadow->offset();
             p->translate(offset);
+            QColor shadowColor = shadow->m_color;
+            shadowColor.setAlphaF(shadowColor.alphaF() * pen.color().alphaF());
+            QPen shadowPen(pen);
+            shadowPen.setColor(shadowColor);
             p->strokePath(platformPath, shadowPen);
             p->translate(-offset);