third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-image-over-color.html - Issue 2673013003: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

Unified Diff: third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-image-over-color.html

Issue 2673013003: 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-helpers.js ('k') | third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-image-over-color-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-image-over-color.html

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-image-over-color.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-image-over-color.html

index d85f313dd480bcc3e991100c2a5ca5c7c23ec1b4..e84bd478b4ae4c5af7bc98fe10cf437d0f961380 100644

--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-image-over-color.html

+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-image-over-color.html

@@ -1,63 +1,34 @@

-<!DOCTYPE HTML>

-<html>

-<head>

- <script type="text/javascript">

- if (window.testRunner)

- testRunner.waitUntilDone();

- window.jsTestIsAsync = true

- </script>

-</head>

-<body>

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

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

- <script type="text/javascript">

- description("Series of tests to ensure correct results on applying different blend modes when drawing an image on top of a color.");

- var context;

- function actualColor(x, y) {

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

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

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

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

+<script>

+async_test(function(t) {

+ function drawElement(context, i) {

+ if (i >= blendModes.length) {

+ t.done();

+ return;

}

- function checkBlendModeResult(i, context, sigma) {

- var expectedColor = blendColors([129 / 255, 1, 129 / 255, 1], [1, 129 / 255, 129 / 255, 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 drawElement(context, i) {

- if (i >= blendModes.length) {

- finishJSTest();

- return;

- }

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

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

- context.save();

- drawBackdropColorInContext(context);

- context.globalCompositeOperation = blendModes[i];

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

+ context.save();

+ drawBackdropColorInContext(context);

+ context.globalCompositeOperation = blendModes[i];

- drawSourceColorImageInContext(context, function() {

+ drawSourceColorImageInContext(context, function() {

+ t.step(function () {

checkBlendModeResult(i, context, 5);

- context.restore();

- debug('');

- drawElement(context, ++i);

});

- }

- function runTest() {

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

- var sigma = 5;

- canvas.width = 10;

- canvas.height = 10;

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

- drawElement(context, 0);

- }

- runTest();

- </script>

-</body>

-</html>

+ context.restore();

+ drawElement(context, ++i);

+ });

+ }

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

+ var sigma = 5;

+ canvas.width = 10;

+ canvas.height = 10;

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

+ drawElement(context, 0);

+}, 'Series of tests to ensure correct results on applying different blend modes when drawing an image on top of a color.');

+</script>