third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-global-alpha.html - Issue 2673883002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

Unified Diff: third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-global-alpha.html

Issue 2673883002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests. (Closed)

Patch Set: Addressing comments Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-fill-style-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-global-alpha-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-global-alpha.html

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-global-alpha.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-global-alpha.html

index 742c0342d458afa273647808d151ed165ae63ccd..d338b2be9b8d19cec5d79a944270c384e5151484 100644

--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-global-alpha.html

+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-global-alpha.html

@@ -1,49 +1,33 @@

-<!DOCTYPE HTML>

-<html>

-<body>

- <script src="../../resources/js-test.js"></script>

- <script type="text/javascript" src="canvas-blending-helpers.js"></script>

- <script type="text/javascript">

+<script src="../../resources/testharness.js"></script>

+<script src="../../resources/testharnessreport.js"></script>

+<script type="text/javascript" src="canvas-blending-helpers.js"></script>

- description("Series of tests to ensure correct results on applying different blend modes when globalAlpha is set.");

+<script>

+function checkBlendModeResult(i, context, sigma) {

+ var expectedColor = blendColors([129 / 255, 1, 129 / 255, 1], [1, 129 / 255, 129 / 255, 0.1], i);

+ var ac = context.getImageData(0, 0, 1, 1).data;

+ assert_approx_equals(ac[0], expectedColor[0], sigma);

+ assert_approx_equals(ac[1], expectedColor[1], sigma);

+ assert_approx_equals(ac[2], expectedColor[2], sigma);

+ assert_approx_equals(ac[3], expectedColor[3], sigma);

- var context;

- function actualColor(x, y) {

- return context.getImageData(x, y, 1, 1).data;

- }

+test(function(t) {

+ var canvas = document.createElement("canvas");

+ var sigma = 5;

+ canvas.width = 10;

+ canvas.height = 10;

+ context = canvas.getContext("2d");

- function checkBlendModeResult(i, context, sigma) {

- var expectedColor = blendColors([129 / 255, 1, 129 / 255, 1], [1, 129 / 255, 129 / 255, 0.1], i);

- var ac = "actualColor(0, 0)";

- shouldBeCloseTo(ac + "[0]", expectedColor[0], sigma);

- shouldBeCloseTo(ac + "[1]", expectedColor[1], sigma);

- shouldBeCloseTo(ac + "[2]", expectedColor[2], sigma);

- shouldBeCloseTo(ac + "[3]", expectedColor[3], sigma);

- }

- function runTest() {

- var canvas = document.createElement("canvas");

- var sigma = 5;

- canvas.width = 10;

- canvas.height = 10;

- context = canvas.getContext("2d");

- for (var i = 0; i < blendModes.length; ++i) {

- debug("Testing blend mode " + blendModes[i]);

- context.clearRect(0, 0, 10, 10);

- context.save();

- drawBackdropColorInContext(context);

- context.globalCompositeOperation = blendModes[i];

- context.globalAlpha = 0.1;

- drawSourceColorInContext(context);

- checkBlendModeResult(i, context, sigma);

- context.restore();

- debug('');

- }

- runTest();

- </script>

-</body>

-</html>

+ for (var i = 0; i < blendModes.length; ++i) {

+ context.clearRect(0, 0, 10, 10);

+ context.save();

+ drawBackdropColorInContext(context);

+ context.globalCompositeOperation = blendModes[i];

+ context.globalAlpha = 0.1;

+ drawSourceColorInContext(context);

+ checkBlendModeResult(i, context, sigma);

+ context.restore();

+ }

+}, 'Series of tests to ensure correct results on applying different blend modes when globalAlpha is set.');

+</script>