Changeset 36044 in webkit

Timestamp:

Sep 2, 2008 11:01:15 PM (16 years ago)

Author:

mrowe@apple.com

Message:

2008-09-02 Dirk Schulze <​vbs85@gmx.de>

Reviewed by Darin Adler.

Fallback on invalid fill or stroke styles in Canvas was
transparent black. Changed it to last valid style.

Canvas fillStyle() and strokeStyle() needs fallback
​https://bugs.webkit.org/show_bug.cgi?id=20474

Tests: fast/canvas/canvas-invalid-fillstyle.html

fast/canvas/canvas-invalid-strokestyle.html

• html/CanvasStyle.cpp: (WebCore::CanvasStyle::applyStrokeColor): (WebCore::CanvasStyle::applyFillColor):

2008-09-02 Dirk Schulze <​vbs85@gmx.de>

Reviewed by Darin Adler.

Tests for ​https://bugs.webkit.org/show_bug.cgi?id=20474
Tests behaviour on invalid fillStyle() or strokeStyle() in canvas.

• fast/canvas/canvas-invalid-fillstyle-expected.txt: Added.
• fast/canvas/canvas-invalid-fillstyle.html: Added.
• fast/canvas/canvas-invalid-fillstyle.js: Added.
• fast/canvas/canvas-invalid-strokestyle-expected.txt: Added.
• fast/canvas/canvas-invalid-strokestyle.html: Added.
• fast/canvas/canvas-invalid-strokestyle.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-invalid-fillstyle-expected.txt (added)
• LayoutTests/fast/canvas/canvas-invalid-fillstyle.html (added)
• LayoutTests/fast/canvas/canvas-invalid-fillstyle.js (added)
• LayoutTests/fast/canvas/canvas-invalid-strokestyle-expected.txt (added)
• LayoutTests/fast/canvas/canvas-invalid-strokestyle.html (added)
• LayoutTests/fast/canvas/canvas-invalid-strokestyle.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/CanvasStyle.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-09-02  Dirk Schulze  <vbs85@gmx.de>
+
+        Reviewed by Darin Adler.
+
+        Tests for https://bugs.webkit.org/show_bug.cgi?id=20474
+        Tests behaviour on invalid fillStyle() or strokeStyle() in canvas.
+
+        * fast/canvas/canvas-invalid-fillstyle-expected.txt: Added.
+        * fast/canvas/canvas-invalid-fillstyle.html: Added.
+        * fast/canvas/canvas-invalid-fillstyle.js: Added.
+        * fast/canvas/canvas-invalid-strokestyle-expected.txt: Added.
+        * fast/canvas/canvas-invalid-strokestyle.html: Added.
+        * fast/canvas/canvas-invalid-strokestyle.js: Added.
+
 2008-09-02  Dirk Schulze  <vbs85@gmx.de>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-09-02  Dirk Schulze  <vbs85@gmx.de>
+
+        Reviewed by Darin Adler.
+
+        Fallback on invalid fill or stroke styles in Canvas was
+        transparent black. Changed it to last valid style.
+
+        Canvas fillStyle() and strokeStyle() needs fallback
+        https://bugs.webkit.org/show_bug.cgi?id=20474
+
+        Tests: fast/canvas/canvas-invalid-fillstyle.html
+               fast/canvas/canvas-invalid-strokestyle.html
+
+        * html/CanvasStyle.cpp:
+        (WebCore::CanvasStyle::applyStrokeColor):
+        (WebCore::CanvasStyle::applyFillColor):
+
 2008-09-02  Dirk Schulze  <vbs85@gmx.de>
 

trunk/WebCore/html/CanvasStyle.cpp

@@ -107 +107 @@
         case ColorString: {
             RGBA32 color = 0; // default is transparant black
-            CSSParser::parseColor(color, m_color);
-            context->setStrokeColor(color);
+            if (CSSParser::parseColor(color, m_color))
+                context->setStrokeColor(color);
             break;
         }
         case ColorStringWithAlpha: {
             RGBA32 color = 0; // default is transparant black
-            CSSParser::parseColor(color, m_color);
-            context->setStrokeColor(colorWithOverrideAlpha(color, m_alpha));
+            if (CSSParser::parseColor(color, m_color))
+                context->setStrokeColor(colorWithOverrideAlpha(color, m_alpha));
             break;
         }
@@ -158 +158 @@
         case ColorString: {
             RGBA32 rgba = 0; // default is transparant black
-            CSSParser::parseColor(rgba, m_color);
-            context->setFillColor(rgba);
+            if (CSSParser::parseColor(rgba, m_color))
+                context->setFillColor(rgba);
             break;
         }
         case ColorStringWithAlpha: {
             RGBA32 color = 0; // default is transparant black
-            CSSParser::parseColor(color, m_color);
-            context->setFillColor(colorWithOverrideAlpha(color, m_alpha));
+            if (CSSParser::parseColor(color, m_color))
+                context->setFillColor(colorWithOverrideAlpha(color, m_alpha));
             break;
         }