[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 17:47:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit db5a43cbd528dac66aef482087be1dd203a89c6a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 30 16:29:30 2010 +0000
2010-11-30 Helder Correia <helder at sencha.com>
Reviewed by Kenneth Rohde Christiansen.
New fast canvas test to ensure correct behavior of canvas with
drawImage + shadow after scaling
https://bugs.webkit.org/show_bug.cgi?id=50202
The shadow offsets of the drawn images must not be affected by the
scaling transformation.
* fast/canvas/canvas-scale-drawImage-shadow-expected.txt: Added.
* fast/canvas/canvas-scale-drawImage-shadow.html: Added.
* fast/canvas/script-tests/canvas-scale-drawImage-shadow.js: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72917 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6dd17f8..277f0f2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-30 Helder Correia <helder at sencha.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ New fast canvas test to ensure correct behavior of canvas with
+ drawImage + shadow after scaling
+ https://bugs.webkit.org/show_bug.cgi?id=50202
+
+ The shadow offsets of the drawn images must not be affected by the
+ scaling transformation.
+
+ * fast/canvas/canvas-scale-drawImage-shadow-expected.txt: Added.
+ * fast/canvas/canvas-scale-drawImage-shadow.html: Added.
+ * fast/canvas/script-tests/canvas-scale-drawImage-shadow.js: Added.
+
2010-11-25 Satish Sampath <satish at chromium.org>
Reviewed by Kent Tamura.
diff --git a/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow-expected.txt b/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow-expected.txt
new file mode 100644
index 0000000..3da0681
--- /dev/null
+++ b/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow-expected.txt
@@ -0,0 +1,57 @@
+Ensure correct behavior of canvas with drawImage+shadow after scaling. A blue and red checkered pattern should be displayed.
+
+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 76
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 76
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 76
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 83
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 83
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 53
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 24
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 24
+PASS d[0] is 255
+PASS d[1] is 0
+PASS d[2] is 0
+PASS d[3] is around 24
+
diff --git a/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow.html b/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow.html
new file mode 100644
index 0000000..64ada75
--- /dev/null
+++ b/LayoutTests/fast/canvas/canvas-scale-drawImage-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-scale-drawImage-shadow.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/canvas/script-tests/canvas-scale-drawImage-shadow.js b/LayoutTests/fast/canvas/script-tests/canvas-scale-drawImage-shadow.js
new file mode 100644
index 0000000..a5c5e77
--- /dev/null
+++ b/LayoutTests/fast/canvas/script-tests/canvas-scale-drawImage-shadow.js
@@ -0,0 +1,155 @@
+description("Ensure correct behavior of canvas with drawImage+shadow after scaling. A blue and red checkered pattern should be displayed.");
+
+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', '50');
+aCanvas.setAttribute('height', '50');
+var aCtx = aCanvas.getContext('2d');
+
+// Fill the same canvas.
+aCtx.fillStyle = 'rgba(0, 0, 255, 1)';
+aCtx.fillRect(0, 0, 50, 50);
+
+// 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 encoded image as the source
+
+// Create master canvas.
+var canvas = document.createElement('canvas');
+document.body.appendChild(canvas);
+canvas.setAttribute('width', '1000');
+canvas.setAttribute('height', '1000');
+var ctx = canvas.getContext('2d');
+
+function drawImageToCanvasAndCheckPixels() {
+ ctx.scale(2, 2);
+ ctx.shadowOffsetX = 100;
+ ctx.shadowOffsetY = 100;
+ ctx.fillStyle = 'rgba(0, 0, 255, 1)';
+
+ ctx.shadowColor = 'rgba(255, 0, 0, 1.0)';
+ ctx.drawImage(img, 50, 50);
+
+ ctx.shadowColor = 'rgba(255, 0, 0, 0.3)';
+ ctx.drawImage(img, 50, 150);
+
+ ctx.shadowColor = 'rgba(255, 0, 0, 1.0)';
+ ctx.shadowBlur = 10;
+ ctx.drawImage(img, 150, 50);
+
+ ctx.shadowColor = 'rgba(255, 0, 0, 0.3)';
+ ctx.drawImage(img, 150, 150);
+
+ checkPixels();
+}
+
+var d; // imageData.data
+
+function checkPixels() {
+
+ // Verify solid shadow.
+ d = ctx.getImageData(205, 205, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBe('d[3]', '255');
+
+ d = ctx.getImageData(295, 295, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBe('d[3]', '255');
+
+ d = ctx.getImageData(205, 295, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBe('d[3]', '255');
+
+ // Verify solid alpha shadow.
+ d = ctx.getImageData(201, 401, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '76');
+
+ d = ctx.getImageData(290, 401, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '76');
+
+ d = ctx.getImageData(290, 498, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '76');
+
+ // Verify blurry shadow.
+ d = ctx.getImageData(398, 205, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '83');
+
+ d = ctx.getImageData(501, 205, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '83');
+
+ d = ctx.getImageData(500, 300, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '53');
+
+ // Verify blurry alpha shadow.
+ d = ctx.getImageData(398, 405, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '24');
+
+ d = ctx.getImageData(405, 501, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '24');
+
+ d = ctx.getImageData(405, 501, 1, 1).data;
+ shouldBe('d[0]', '255');
+ shouldBe('d[1]', '0');
+ shouldBe('d[2]', '0');
+ shouldBeAround('d[3]', '24');
+}
+
+var successfullyParsed = true;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list