Chromium Code Reviews Chromium Code Reviews
Issue 2678493002:
Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests. (Closed)
| Index: third_party/WebKit/LayoutTests/fast/canvas/canvas-fillPath-pattern-shadow.html |
| diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillPath-pattern-shadow.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillPath-pattern-shadow.html |
| index dd5f0089a298ad2e3a7626e729194c94ee1fd660..05b58684dea4d51a3552888af8f1124bf9a3a760 100644 |
| --- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillPath-pattern-shadow.html |
| +++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillPath-pattern-shadow.html |
| @@ -1,9 +1,128 @@ |
| -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> |
| -<html> |
| -<head> |
| -<script src="../../resources/js-test.js"></script> |
| -</head> |
| +<script src="../../resources/testharness.js"></script> |
| +<script src="../../resources/testharnessreport.js"></script> |
| <body> |
| -<script src="script-tests/canvas-fillPath-pattern-shadow.js"></script> |
| +<script> |
| +test(function(t) { |
| + |
| +function print(message, color) |
|
Justin Novosad
2017/02/06 20:04:23
indent
zakerinasab
2017/02/09 18:02:00
Done.
|
| +{ |
| + 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) |
|
Justin Novosad
2017/02/06 20:04:23
Remove this. We use assert_approx_equals now.
zakerinasab
2017/02/09 18:02:00
Done.
|
| +{ |
| + var evalA; |
| + try { |
| + evalA = eval(a); |
| + } catch(e) { |
| + evalA = e; |
| + } |
| + |
| + if (Math.abs(evalA - b) < 15) |
| + print("PASS " + a + " is around " + b , "green") |
| + else |
| + print("FAIL " + a + " is not around " + b + " (actual: " + evalA + ")", "red"); |
| +} |
| + |
| +var aCanvas = document.createElement('canvas'); |
| +aCanvas.setAttribute('width', '50'); |
| +aCanvas.setAttribute('height', '50'); |
| + |
| +var aCtx = aCanvas.getContext('2d'); |
| +aCtx.fillStyle = 'rgba(0, 0, 255, 0.5)'; |
| +aCtx.fillRect(0, 0, 50, 50); |
| + |
| +var pattern = aCtx.createPattern(aCanvas, 'repeat'); |
| + |
| +var canvas = document.createElement('canvas'); |
| +document.body.appendChild(canvas); |
| +canvas.setAttribute('width', '600'); |
| +canvas.setAttribute('height', '1100'); |
| +var ctx = canvas.getContext('2d'); |
| + |
| +ctx.save(); |
| +ctx.fillStyle = pattern; |
| +ctx.shadowColor = 'rgba(255, 0, 0, 0.5)'; |
| +ctx.shadowOffsetX = 250; |
| + |
| +function fillShape(x, y) { |
| + ctx.beginPath(); |
| + ctx.arc(x, y, 100, 0, Math.PI*2, true); |
| + ctx.arc(x, y, 50, 0, Math.PI*2, false); |
| + ctx.fill(); |
| +} |
| + |
| +// Alpha shadow. |
| +ctx.shadowBlur = 0; |
| +fillShape(150, 150); |
| + |
| +// Blurry shadow. |
| +ctx.shadowBlur = 10; |
| +fillShape(150, 400); |
| + |
| +ctx.rotate(Math.PI/2); |
| + |
| +// Rotated alpha shadow. |
| +ctx.shadowBlur = 0; |
| +fillShape(650, -150); |
| + |
| +// Rotated blurry shadow. |
| +ctx.shadowBlur = 10; |
| +fillShape(900, -150); |
| + |
| +ctx.restore(); |
| + |
| +var imageData, data; |
| +ctx.fillStyle = 'black'; |
| + |
| +function test(x, y, r, g, b, a, alphaApprox) { |
|
Justin Novosad
2017/02/06 20:04:23
This is confusing because testharness.js also defi
zakerinasab
2017/02/09 18:02:01
Done.
|
| + // Get pixel. |
| + imageData = ctx.getImageData(x, y, 1, 1); |
| + data = imageData.data; |
| + // Test pixel color components. |
| + assert_equals(data[0], r); |
| + assert_equals(data[1], g); |
| + assert_equals(data[2], b); |
| + if (alphaApprox === undefined) |
| + alphaApprox = 15; |
| + assert_approx_equals(data[3], a, alphaApprox); |
| + // Plot test point. |
| + ctx.fillRect(x, y, 3, 3); |
| +} |
| + |
| +// Verifying alpha shadow... |
| +test(400, 150, 0, 0, 0, 0, 0); |
|
Justin Novosad
2017/02/06 20:04:23
Could use generate_tests()
zakerinasab
2017/02/09 18:02:00
Done.
|
| +test(400, 75, 255, 0, 0, 64); |
| +test(400, 225, 255, 0, 0, 64); |
| +test(325, 150, 255, 0, 0, 64); |
| +test(475, 150, 255, 0, 0, 64); |
| + |
| +// Verifying blurry shadow... |
| +test(400, 400, 0, 0, 0, 0, 0); |
| +test(400, 300, 255, 0, 0, 31); |
| +test(400, 500, 255, 0, 0, 31); |
| +test(300, 400, 255, 0, 0, 31); |
| +test(500, 400, 255, 0, 0, 31); |
| + |
| +// Verifying rotated alpha shadow... |
| +test(400, 650, 0, 0, 0, 0, 0); |
| +test(400, 575, 255, 0, 0, 64); |
| +test(400, 725, 255, 0, 0, 64); |
| +test(325, 650, 255, 0, 0, 64); |
| +test(475, 650, 255, 0, 0, 64); |
| + |
| +// Verifying rotated blurry shadow... |
| +test(400, 900, 0, 0, 0, 0, 0); |
| +test(400, 800, 255, 0, 0, 31); |
| +test(400, 1000, 255, 0, 0, 31); |
| +test(300, 900, 255, 0, 0, 31); |
| +test(500, 900, 255, 0, 0, 31); |
| + |
| +}, "Ensure correct behavior of canvas with fillPath using a pattern fillStyle and a shadow"); |
| +</script> |
| </body> |
| -</html> |
