WebCore:

2009-01-04  Darin Adler  <darin@apple.com>

        Reviewed by Oliver Hunt.

        Bug 23105: canvas setFillColor function ignores alpha argument
        https://bugs.webkit.org/show_bug.cgi?id=23105

        Test: fast/canvas/set-colors.html

        * html/CanvasRenderingContext2D.cpp:
        (WebCore::CanvasRenderingContext2D::setFillColor): Pass alpha value through instead
        of ignoring it and always passing 1.

        * html/CanvasStyle.cpp:
        (WebCore::CanvasStyle::applyStrokeColor): Fix spelling of transparent in comments.
        (WebCore::CanvasStyle::applyFillColor): Ditto.

LayoutTests:

2009-01-04  Darin Adler  <darin@apple.com>

        Reviewed by Oliver Hunt.

        Bug 23105: canvas setFillColor function ignores alpha argument
        https://bugs.webkit.org/show_bug.cgi?id=23105

        * fast/canvas/resources/set-colors.js: Added.
        * fast/canvas/set-colors-expected.txt: Added.
        * fast/canvas/set-colors.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@39595 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ac6a4be..128c451 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-01-04  Darin Adler  <darin@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Bug 23105: canvas setFillColor function ignores alpha argument
+        https://bugs.webkit.org/show_bug.cgi?id=23105
+
+        * fast/canvas/resources/set-colors.js: Added.
+        * fast/canvas/set-colors-expected.txt: Added.
+        * fast/canvas/set-colors.html: Added.
+
 2009-01-04  Simon Fraser  <simon.fraser@apple.com>
 
         Fix the expected image to account for a typo fix done on 2008-12-23.

diff --git a/LayoutTests/fast/canvas/resources/set-colors.js b/LayoutTests/fast/canvas/resources/set-colors.js
new file mode 100644 (file)
index 0000000..848de3d
--- /dev/null
+++ b/LayoutTests/fast/canvas/resources/set-colors.js
@@ -0,0 +1,163 @@
+description("Test of various canvas graphics context calls for setting colors.");
+
+var canvas = document.createElement("canvas");
+var context = canvas.getContext('2d');
+
+function clear()
+{
+    context.clearRect(0, 0, canvas.width, canvas.height);
+}
+
+function hex(number)
+{
+    var hexDigits = "0123456789abcdef";
+    return hexDigits[number >> 4] + hexDigits[number & 0xF];
+}
+
+function pixel()
+{
+    var imageData = context.getImageData(0, 0, 1, 1);
+    if (imageData.data[3] == 255)
+        return "#" + hex(imageData.data[0]) + hex(imageData.data[1]) + hex(imageData.data[2]);
+    if (imageData.data[3] == 0)
+        return "rgba(" + imageData.data[0] + ", " + imageData.data[1] + ", " + imageData.data[2] + ", 0.0)";
+    return "rgba(" + imageData.data[0] + ", " + imageData.data[1] + ", " + imageData.data[2] + ", " + (imageData.data[3] / 255) + ")";
+}
+
+function testFillStyle(string)
+{
+    clear();
+    context.fillStyle = "black";
+    context.fillStyle = string;
+    context.fillRect(0, 0, 1, 1);
+    return pixel();
+}
+
+function testFillGradient(string)
+{
+    clear();
+    context.fillStyle = "black";
+    var gradient = context.createLinearGradient(0, 0, 1, 1);
+    gradient.addColorStop(0, string);
+    gradient.addColorStop(1, string);
+    context.fillStyle = gradient;
+    context.fillRect(0, 0, 1, 1);
+    return pixel();
+}
+
+function testSetFillColor(arguments)
+{
+    clear();
+    context.fillStyle = "black";
+    eval("context.setFillColor(" + arguments + ")");
+    context.fillRect(0, 0, 1, 1);
+    return pixel();
+}
+
+function testStrokeStyle(string)
+{
+    clear();
+    context.lineWidth = 5;
+    context.strokeStyle = "black";
+    context.strokeStyle = string;
+    context.strokeRect(2, 2, 10, 10);
+    return pixel();
+}
+
+function testStrokeGradient(string)
+{
+    clear();
+    context.lineWidth = 5;
+    context.strokeStyle = "black";
+    var gradient = context.createLinearGradient(0, 0, 1, 1);
+    gradient.addColorStop(0, string);
+    gradient.addColorStop(1, string);
+    context.strokeStyle = gradient;
+    context.strokeRect(2, 2, 10, 10);
+    return pixel();
+}
+
+function testSetStrokeColor(arguments)
+{
+    clear();
+    context.lineWidth = 5;
+    context.strokeStyle = "black";
+    eval("context.setStrokeColor(" + arguments + ")");
+    context.strokeRect(2, 2, 10, 10);
+    return pixel();
+}
+
+var transparent = "rgba(0, 0, 0, 0.0)";
+var red = "#ff0000";
+var green = "#00ff00";
+var blue = "#0000ff";
+var white = "#ffffff";
+var translucentRed = "rgba(255, 0, 0, 0.8)";
+var translucentGreen = "rgba(0, 255, 0, 0.8)";
+var translucentBlue = "rgba(0, 0, 255, 0.8)";
+var translucentWhite = "rgba(255, 255, 255, 0.8)";
+
+shouldBe("testFillStyle('transparent')", "transparent");
+shouldBe("testFillStyle('blue')", "blue");
+shouldBe("testFillStyle('#FF0000')", "red");
+shouldBe("testFillStyle('#f00')", "red");
+shouldBe("testFillStyle('rgb(255, 0, 0)')", "red");
+shouldBe("testFillStyle('rgba(255, 0, 0, 1)')", "red");
+shouldBe("testFillStyle('rgba(255, 0, 0, 0.8)')", "translucentRed");
+shouldBe("testFillStyle('rgba(255, 0, 0, 0)')", "transparent");
+shouldBe("testFillGradient('transparent')", "transparent");
+shouldBe("testFillGradient('blue')", "blue");
+shouldBe("testFillGradient('#FF0000')", "red");
+shouldBe("testFillGradient('#f00')", "red");
+shouldBe("testFillGradient('rgb(255, 0, 0)')", "red");
+shouldBe("testFillGradient('rgba(255, 0, 0, 1)')", "red");
+shouldBe("testFillGradient('rgba(255, 0, 0, 0.8)')", "translucentRed");
+shouldBe("testFillGradient('rgba(255, 0, 0, 0)')", "transparent");
+shouldBe("testSetFillColor('\"blue\"')", "blue");
+shouldBe("testSetFillColor('\"#FF0000\"')", "red");
+shouldBe("testSetFillColor('\"#f00\"')", "red");
+shouldBe("testSetFillColor('\"rgb(255, 0, 0)\"')", "red");
+shouldBe("testSetFillColor('\"rgba(255, 0, 0, 1)\"')", "red");
+shouldBe("testSetFillColor('\"rgba(255, 0, 0, 0.8)\"')", "translucentRed");
+shouldBe("testSetFillColor('\"rgba(255, 0, 0, 0)\"')", "transparent");
+shouldBe("testSetFillColor('\"blue\", 0.8')", "translucentBlue");
+shouldBe("testSetFillColor('1')", "white");
+shouldBe("testSetFillColor('1, 0.8')", "translucentWhite");
+shouldBe("testSetFillColor('0, 1, 0, 1')", "green");
+shouldBe("testSetFillColor('0, 1, 0, 0.8')", "translucentGreen");
+shouldBe("testSetFillColor('0, 1, 0, 0, 1')", "'#c9006c'");
+shouldBe("testSetFillColor('0, 1, 0, 0, 0.8')", "'rgba(200, 0, 107, 0.8)'");
+shouldBe("testSetFillColor('0, 1, 0, 0, 0')", "transparent");
+shouldBe("testStrokeStyle('transparent')", "transparent");
+shouldBe("testStrokeStyle('blue')", "blue");
+shouldBe("testStrokeStyle('#FF0000')", "red");
+shouldBe("testStrokeStyle('#f00')", "red");
+shouldBe("testStrokeStyle('rgb(255, 0, 0)')", "red");
+shouldBe("testStrokeStyle('rgba(255, 0, 0, 1)')", "red");
+shouldBe("testStrokeStyle('rgba(255, 0, 0, 0.8)')", "translucentRed");
+shouldBe("testStrokeStyle('rgba(255, 0, 0, 0)')", "transparent");
+shouldBe("testStrokeGradient('transparent')", "transparent");
+shouldBe("testStrokeGradient('blue')", "blue");
+shouldBe("testStrokeGradient('#FF0000')", "red");
+shouldBe("testStrokeGradient('#f00')", "red");
+shouldBe("testStrokeGradient('rgb(255, 0, 0)')", "red");
+shouldBe("testStrokeGradient('rgba(255, 0, 0, 1)')", "red");
+shouldBe("testStrokeGradient('rgba(255, 0, 0, 0.8)')", "translucentRed");
+shouldBe("testStrokeGradient('rgba(255, 0, 0, 0)')", "transparent");
+shouldBe("testSetStrokeColor('\"blue\"')", "blue");
+shouldBe("testSetStrokeColor('\"#FF0000\"')", "red");
+shouldBe("testSetStrokeColor('\"#f00\"')", "red");
+shouldBe("testSetStrokeColor('\"rgb(255, 0, 0)\"')", "red");
+shouldBe("testSetStrokeColor('\"rgba(255, 0, 0, 1)\"')", "red");
+shouldBe("testSetStrokeColor('\"rgba(255, 0, 0, 0.8)\"')", "translucentRed");
+shouldBe("testSetStrokeColor('\"rgba(255, 0, 0, 0)\"')", "transparent");
+shouldBe("testSetStrokeColor('\"blue\", 0.8')", "translucentBlue");
+shouldBe("testSetStrokeColor('1')", "white");
+shouldBe("testSetStrokeColor('1, 0.8')", "translucentWhite");
+shouldBe("testSetStrokeColor('0, 1, 0, 1')", "green");
+shouldBe("testSetStrokeColor('0, 1, 0, 0.8')", "translucentGreen");
+shouldBe("testSetStrokeColor('0, 1, 0, 0, 1')", "'#c9006c'");
+shouldBe("testSetStrokeColor('0, 1, 0, 0, 0.8')", "'rgba(200, 0, 107, 0.8)'");
+shouldBe("testSetStrokeColor('0, 1, 0, 0, 0')", "transparent");
+
+var successfullyParsed = true;

diff --git a/LayoutTests/fast/canvas/set-colors-expected.txt b/LayoutTests/fast/canvas/set-colors-expected.txt
new file mode 100644 (file)
index 0000000..4d1c7c4
--- /dev/null
+++ b/LayoutTests/fast/canvas/set-colors-expected.txt
@@ -0,0 +1,71 @@
+Test of various canvas graphics context calls for setting colors.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testFillStyle('transparent') is transparent
+PASS testFillStyle('blue') is blue
+PASS testFillStyle('#FF0000') is red
+PASS testFillStyle('#f00') is red
+PASS testFillStyle('rgb(255, 0, 0)') is red
+PASS testFillStyle('rgba(255, 0, 0, 1)') is red
+PASS testFillStyle('rgba(255, 0, 0, 0.8)') is translucentRed
+PASS testFillStyle('rgba(255, 0, 0, 0)') is transparent
+PASS testFillGradient('transparent') is transparent
+PASS testFillGradient('blue') is blue
+PASS testFillGradient('#FF0000') is red
+PASS testFillGradient('#f00') is red
+PASS testFillGradient('rgb(255, 0, 0)') is red
+PASS testFillGradient('rgba(255, 0, 0, 1)') is red
+PASS testFillGradient('rgba(255, 0, 0, 0.8)') is translucentRed
+PASS testFillGradient('rgba(255, 0, 0, 0)') is transparent
+PASS testSetFillColor('"blue"') is blue
+PASS testSetFillColor('"#FF0000"') is red
+PASS testSetFillColor('"#f00"') is red
+PASS testSetFillColor('"rgb(255, 0, 0)"') is red
+PASS testSetFillColor('"rgba(255, 0, 0, 1)"') is red
+PASS testSetFillColor('"rgba(255, 0, 0, 0.8)"') is translucentRed
+PASS testSetFillColor('"rgba(255, 0, 0, 0)"') is transparent
+FAIL testSetFillColor('"blue", 0.8') should be rgba(0, 0, 255, 0.8). Was #0000ff.
+PASS testSetFillColor('1') is white
+PASS testSetFillColor('1, 0.8') is translucentWhite
+PASS testSetFillColor('0, 1, 0, 1') is green
+PASS testSetFillColor('0, 1, 0, 0.8') is translucentGreen
+PASS testSetFillColor('0, 1, 0, 0, 1') is '#c9006c'
+PASS testSetFillColor('0, 1, 0, 0, 0.8') is 'rgba(200, 0, 107, 0.8)'
+PASS testSetFillColor('0, 1, 0, 0, 0') is transparent
+PASS testStrokeStyle('transparent') is transparent
+PASS testStrokeStyle('blue') is blue
+PASS testStrokeStyle('#FF0000') is red
+PASS testStrokeStyle('#f00') is red
+PASS testStrokeStyle('rgb(255, 0, 0)') is red
+PASS testStrokeStyle('rgba(255, 0, 0, 1)') is red
+PASS testStrokeStyle('rgba(255, 0, 0, 0.8)') is translucentRed
+PASS testStrokeStyle('rgba(255, 0, 0, 0)') is transparent
+PASS testStrokeGradient('transparent') is transparent
+PASS testStrokeGradient('blue') is blue
+PASS testStrokeGradient('#FF0000') is red
+PASS testStrokeGradient('#f00') is red
+PASS testStrokeGradient('rgb(255, 0, 0)') is red
+PASS testStrokeGradient('rgba(255, 0, 0, 1)') is red
+PASS testStrokeGradient('rgba(255, 0, 0, 0.8)') is translucentRed
+PASS testStrokeGradient('rgba(255, 0, 0, 0)') is transparent
+PASS testSetStrokeColor('"blue"') is blue
+PASS testSetStrokeColor('"#FF0000"') is red
+PASS testSetStrokeColor('"#f00"') is red
+PASS testSetStrokeColor('"rgb(255, 0, 0)"') is red
+PASS testSetStrokeColor('"rgba(255, 0, 0, 1)"') is red
+PASS testSetStrokeColor('"rgba(255, 0, 0, 0.8)"') is translucentRed
+PASS testSetStrokeColor('"rgba(255, 0, 0, 0)"') is transparent
+PASS testSetStrokeColor('"blue", 0.8') is translucentBlue
+PASS testSetStrokeColor('1') is white
+PASS testSetStrokeColor('1, 0.8') is translucentWhite
+PASS testSetStrokeColor('0, 1, 0, 1') is green
+PASS testSetStrokeColor('0, 1, 0, 0.8') is translucentGreen
+PASS testSetStrokeColor('0, 1, 0, 0, 1') is '#c9006c'
+PASS testSetStrokeColor('0, 1, 0, 0, 0.8') is 'rgba(200, 0, 107, 0.8)'
+PASS testSetStrokeColor('0, 1, 0, 0, 0') is transparent
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

diff --git a/LayoutTests/fast/canvas/set-colors.html b/LayoutTests/fast/canvas/set-colors.html
new file mode 100644 (file)
index 0000000..cddfe9e
--- /dev/null
+++ b/LayoutTests/fast/canvas/set-colors.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="resources/set-colors.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 17cfb19..268d07e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,22 @@
 2009-01-04  Darin Adler  <darin@apple.com>
 
+        Reviewed by Oliver Hunt.
+
+        Bug 23105: canvas setFillColor function ignores alpha argument
+        https://bugs.webkit.org/show_bug.cgi?id=23105
+
+        Test: fast/canvas/set-colors.html
+
+        * html/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::setFillColor): Pass alpha value through instead
+        of ignoring it and always passing 1.
+
+        * html/CanvasStyle.cpp:
+        (WebCore::CanvasStyle::applyStrokeColor): Fix spelling of transparent in comments.
+        (WebCore::CanvasStyle::applyFillColor): Ditto.
+
+2009-01-04  Darin Adler  <darin@apple.com>
+
         Bug 23086: REGRESSION(r39540/r39541): Windows build fails due to ICU errors
         https://bugs.webkit.org/show_bug.cgi?id=23086
 

diff --git a/WebCore/html/CanvasRenderingContext2D.cpp b/WebCore/html/CanvasRenderingContext2D.cpp
index c8efac2..b0675b4 100644 (file)
--- a/WebCore/html/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/CanvasRenderingContext2D.cpp
@@ -499,7 +499,7 @@ void CanvasRenderingContext2D::setFillColor(float grayLevel)
 
 void CanvasRenderingContext2D::setFillColor(const String& color, float alpha)
 {
-    setFillStyle(CanvasStyle::create(color, 1));
+    setFillStyle(CanvasStyle::create(color, alpha));
 }
 
 void CanvasRenderingContext2D::setFillColor(float grayLevel, float alpha)

diff --git a/WebCore/html/CanvasStyle.cpp b/WebCore/html/CanvasStyle.cpp
index 0f00f2c..ce1674e 100644 (file)
--- a/WebCore/html/CanvasStyle.cpp
+++ b/WebCore/html/CanvasStyle.cpp
@@ -110,7 +110,7 @@ void CanvasStyle::applyStrokeColor(GraphicsContext* context)
                 context->setStrokeColor(c.rgb());
                 break;
             }
-            RGBA32 color = 0; // default is transparant black
+            RGBA32 color = 0; // default is transparent black
             if (CSSParser::parseColor(color, m_color))
                 context->setStrokeColor(color);
             break;
@@ -121,7 +121,7 @@ void CanvasStyle::applyStrokeColor(GraphicsContext* context)
                 context->setStrokeColor(colorWithOverrideAlpha(c.rgb(), m_alpha));
                 break;
             }
-            RGBA32 color = 0; // default is transparant black
+            RGBA32 color = 0; // default is transparent black
             if (CSSParser::parseColor(color, m_color))
                 context->setStrokeColor(colorWithOverrideAlpha(color, m_alpha));
             break;
@@ -171,7 +171,7 @@ void CanvasStyle::applyFillColor(GraphicsContext* context)
                 context->setFillColor(c.rgb());
                 break;
             }
-            RGBA32 rgba = 0; // default is transparant black
+            RGBA32 rgba = 0; // default is transparent black
             if (CSSParser::parseColor(rgba, m_color))
                 context->setFillColor(rgba);
             break;
@@ -182,7 +182,7 @@ void CanvasStyle::applyFillColor(GraphicsContext* context)
                 context->setFillColor(colorWithOverrideAlpha(c.rgb(), m_alpha));
                 break;
             }
-            RGBA32 color = 0; // default is transparant black
+            RGBA32 color = 0; // default is transparent black
             if (CSSParser::parseColor(color, m_color))
                 context->setFillColor(colorWithOverrideAlpha(color, m_alpha));
             break;