Changeset 55993 in webkit

Timestamp:

Mar 15, 2010 7:34:25 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-15 Shu Chang <​Chang.Shu@nokia.com>

Reviewed by Holger Freyther.

[Qt] Change and add expected results after the fix and also remove the test from Skipped.
​https://bugs.webkit.org/show_bug.cgi?id=36060

• platform/qt/Skipped:
• platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.checksum: Added.
• platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.png: Added.
• platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.txt:

2010-03-15 Shu Chang <​Chang.Shu@nokia.com>

Reviewed by Holger Freyther.

[Qt] The behavior of QGradient with no stops is defined differently from HTML5 spec,
where the latter requires the gradient to be transparent black. Explicitly added a
transparent black color stop to match the HTML5 behavior.
​https://bugs.webkit.org/show_bug.cgi?id=36060

• platform/graphics/qt/GradientQt.cpp: (WebCore::Gradient::platformGradient):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.checksum (added)
• LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.png (added)
• LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/GradientQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-15  Shu Chang  <Chang.Shu@nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        [Qt] Change and add expected results after the fix and also remove the test from Skipped.
+        https://bugs.webkit.org/show_bug.cgi?id=36060
+
+        * platform/qt/Skipped:
+        * platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.checksum: Added.
+        * platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.png: Added.
+        * platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.txt:
+
 2010-03-15  MORITA Hajime  <morrita@google.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -2458 +2458 @@
 fast/canvas/canvas-text-baseline.html
 fast/canvas/fillrect_gradient.html
-fast/canvas/fillrect-gradient-zero-stops.html
 fast/canvas/fill-stroke-clip-reset-path.html
 fast/canvas/image-object-in-canvas.html

trunk/LayoutTests/platform/qt/fast/canvas/fillrect-gradient-zero-stops-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x57
-        RenderText {#text} at (0,0) size 750x38
-          text run at (0,0) width 750: "The canvas below should show a gradient with zero stops, which according to the specification is filled with transparant"
-          text run at (0,19) width 196: "black, ie. not visible. This tests "
-        RenderInline {A} at (0,0) size 751x38 [color=#0000EE]
-          RenderText {#text} at (196,19) size 751x38
-            text run at (196,19) width 555: "Bug 13784, REGRESSION (r13744-13750): Crash with empty gradient when drawing to"
-            text run at (0,38) width 45: "canvas"
-      RenderBlock (anonymous) at (0,71) size 784x150
+      RenderBlock {P} at (0,0) size 784x60
+        RenderText {#text} at (0,0) size 756x40
+          text run at (0,0) width 756: "The canvas below should show a gradient with zero stops, which according to the specification is filled with"
+          text run at (0,20) width 303: "transparant black, ie. not visible. This tests "
+        RenderInline {A} at (0,0) size 742x40 [color=#0000EE]
+          RenderText {#text} at (303,20) size 742x40
+            text run at (303,20) width 439: "Bug 13784, REGRESSION (r13744-13750): Crash with empty"
+            text run at (0,40) width 234: "gradient when drawing to canvas"
+      RenderBlock (anonymous) at (0,76) size 784x150
         RenderHTMLCanvas {CANVAS} at (0,0) size 300x150
         RenderText {#text} at (0,0) size 0x0

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-15  Shu Chang  <Chang.Shu@nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        [Qt] The behavior of QGradient with no stops is defined differently from HTML5 spec,
+        where the latter requires the gradient to be transparent black. Explicitly added a
+        transparent black color stop to match the HTML5 behavior.
+        https://bugs.webkit.org/show_bug.cgi?id=36060
+
+        * platform/graphics/qt/GradientQt.cpp:
+        (WebCore::Gradient::platformGradient):
+
 2010-03-11  Antonio Gomes  <tonikitoo@webkit.org>
 

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

@@ -68 +68 @@
     }
 
+    if (m_stops.isEmpty()) {
+        // The behavior of QGradient with no stops is defined differently from HTML5 spec,
+        // where the latter requires the gradient to be transparent black.
+        m_gradient->setColorAt(0.0, QColor(0, 0, 0, 0));
+    }
+
     switch (m_spreadMethod) {
     case SpreadMethodPad: