[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 16:34:43 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4a1fc11368cfa5101722edc6669b83c0561022a4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 26 11:25:41 2010 +0000
2010-11-26 Helder Correia <helder at sencha.com>
Reviewed by Kenneth Rohde Christiansen.
New fast canvas test: createPattern + fillRect with shadow
https://bugs.webkit.org/show_bug.cgi?id=50104
Ensure that fillRect works correctly with an image pattern with
transparency set as the fillStyle.
* fast/canvas/canvas-createPattern-fillRect-shadow-expected.txt: Added.
* fast/canvas/canvas-createPattern-fillRect-shadow.html: Added.
* fast/canvas/script-tests/canvas-createPattern-fillRect-shadow.js: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72756 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e20cb98..8baa062 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-26 Helder Correia <helder at sencha.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ New fast canvas test: createPattern + fillRect with shadow
+ https://bugs.webkit.org/show_bug.cgi?id=50104
+
+ Ensure that fillRect works correctly with an image pattern with
+ transparency set as the fillStyle.
+
+ * fast/canvas/canvas-createPattern-fillRect-shadow-expected.txt: Added.
+ * fast/canvas/canvas-createPattern-fillRect-shadow.html: Added.
+ * fast/canvas/script-tests/canvas-createPattern-fillRect-shadow.js: Added.
+
2010-11-25 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow-expected.txt b/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow-expected.txt
new file mode 100644
index 0000000..7d68d89
--- /dev/null
+++ b/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow-expected.txt
@@ -0,0 +1,57 @@
+Ensure correct behavior of canvas with createPattern + fillRect with shadow.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is 255
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is 255
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is 255
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 51
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 51
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 51
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 141
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 113
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 51
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 29
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 23
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 29
+
diff --git a/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow.html b/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow.html
new file mode 100644
index 0000000..9fb08be
--- /dev/null
+++ b/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow.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="script-tests/canvas-createPattern-fillRect-shadow.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/canvas/script-tests/canvas-createPattern-fillRect-shadow.js b/LayoutTests/fast/canvas/script-tests/canvas-createPattern-fillRect-shadow.js
new file mode 100644
index 0000000..bb47648
--- /dev/null
+++ b/LayoutTests/fast/canvas/script-tests/canvas-createPattern-fillRect-shadow.js
@@ -0,0 +1,166 @@
+description("Ensure correct behavior of canvas with createPattern + fillRect with shadow.");
+
+function print(message, color)
+{
+ var paragraph = document.createElement("div");
+ paragraph.appendChild(document.createTextNode(message));
+ paragraph.style.fontFamily = "monospace";
+ if (color)
+ paragraph.style.color = color;
+ document.getElementById("console").appendChild(paragraph);
+}
+
+function shouldBeAround(a, b)
+ {
+ var evalA;
+ try {
+ evalA = eval(a);
+ } catch(e) {
+ evalA = e;
+ }
+
+ if (Math.abs(evalA - b) < 10)
+ print("PASS " + a + " is around " + b , "green")
+ else
+ print("FAIL " + a + " is not around " + b + " (actual: " + evalA + ")", "red");
+ }
+
+// Create auxiliary canvas to draw to and create an image from.
+// This is done instead of simply loading an image from the file system
+// because that would throw a SECURITY_ERR DOM Exception.
+var aCanvas = document.createElement('canvas');
+aCanvas.setAttribute('width', '200');
+aCanvas.setAttribute('height', '200');
+var aCtx = aCanvas.getContext('2d');
+
+// Draw a circle on the same canvas.
+aCtx.beginPath();
+aCtx.fillStyle = 'blue';
+aCtx.arc(100, 100, 100, 0, Math.PI*2, false);
+aCtx.fill();
+
+// Create the image object to be drawn on the master canvas.
+var img = new Image();
+img.onload = drawImageToCanvasAndCheckPixels;
+img.src = aCanvas.toDataURL(); // set a data URI of the base64 enconded image as the source
+
+// Create master canvas.
+var canvas = document.createElement('canvas');
+document.body.appendChild(canvas);
+canvas.setAttribute('width', '700');
+canvas.setAttribute('height', '1100');
+var ctx = canvas.getContext('2d');
+
+function drawImageToCanvasAndCheckPixels() {
+ ctx.shadowOffsetX = 250;
+ ctx.fillStyle = ctx.createPattern(img, 'repeat');
+
+ ctx.shadowColor = 'rgba(255, 0, 0, 1.0)';
+ ctx.fillRect(50, 50, 200, 200);
+
+ ctx.shadowColor = 'rgba(255, 0, 0, 0.2)';
+ ctx.fillRect(50, 300, 200, 200);
+
+ ctx.shadowBlur = 10;
+ ctx.shadowColor = 'rgba(255, 0, 0, 1.0)';
+ ctx.fillRect(50, 550, 200, 200);
+
+ ctx.shadowColor = 'rgba(255, 0, 0, 0.2)';
+ ctx.fillRect(50, 800, 200, 200);
+
+ checkPixels();
+}
+
+function checkPixels() {
+ var imageData, data;
+
+ // Verify solid shadow.
+ imageData = ctx.getImageData(300, 50, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBe('d[3]', '255');
+
+ imageData = ctx.getImageData(300, 249, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBe('d[3]', '255');
+
+ imageData = ctx.getImageData(490, 240, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBe('d[3]', '255');
+
+ // Verify solid alpha shadow.
+ imageData = ctx.getImageData(310, 350, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '51');
+
+ imageData = ctx.getImageData(490, 490, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '51');
+
+ imageData = ctx.getImageData(300, 499, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '51');
+
+ // Verify blurry shadow.
+ imageData = ctx.getImageData(310, 550, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '141');
+
+ imageData = ctx.getImageData(490, 750, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '113');
+
+ imageData = ctx.getImageData(499, 499, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '51');
+
+ // Verify blurry alpha shadow.
+ imageData = ctx.getImageData(300, 850, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '29');
+
+ imageData = ctx.getImageData(500, 875, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '23');
+
+ imageData = ctx.getImageData(300, 900, 1, 1);
+ d = imageData.data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '29');
+}
+
+var successfullyParsed = true;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list