third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-scaled-copy-to-self.html - Issue 2674863003: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

Unified Diff: third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-scaled-copy-to-self.html

Issue 2674863003: 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-drawImage-live-video-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-scaled-copy-to-self-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-drawImage-scaled-copy-to-self.html

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-scaled-copy-to-self.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-scaled-copy-to-self.html

index 8702e20fd6bacc514f16c03d2a1d54c883ff322c..29b311703ae660267fa399aaf7a9dfe0971abf2a 100644

--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-scaled-copy-to-self.html

+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-scaled-copy-to-self.html

@@ -1,52 +1,44 @@

-<!DOCTYPE html>

-<html>

-<head>

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

-</head>

-<body>

-<p id="description"></p>

-<div id="console"></div>

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

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

-description("Tests drawImage with self as source image, copy composite operation, and downsized destination rect. Regression test for issue crbug.com/330711");

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

-canvas.width = 10;

-canvas.height = 10;

-var ctx = canvas.getContext('2d');

-ctx.globalCompositeOperation = 'copy';

-ctx.fillStyle = '#0f0';

-ctx.fillRect(0, 0, 10, 10);

-ctx.drawImage(canvas, 0, 0, 10, 10, 0, 0, 5, 5);

-var imageData = ctx.getImageData(0, 0, 1, 1);

-var imgdata = imageData.data;

-shouldBe("imgdata[0]", "0");

-shouldBe("imgdata[1]", "255");

-shouldBe("imgdata[2]", "0");

-shouldBe("imgdata[3]", "255");

-var imageData = ctx.getImageData(4, 4, 1, 1);

-var imgdata = imageData.data;

-shouldBe("imgdata[0]", "0");

-shouldBe("imgdata[1]", "255");

-shouldBe("imgdata[2]", "0");

-shouldBe("imgdata[3]", "255");

-var imageData = ctx.getImageData(4, 5, 1, 1);

-var imgdata = imageData.data;

-shouldBe("imgdata[0]", "0");

-shouldBe("imgdata[1]", "0");

-shouldBe("imgdata[2]", "0");

-shouldBe("imgdata[3]", "0");

-var imageData = ctx.getImageData(5, 4, 1, 1);

-var imgdata = imageData.data;

-shouldBe("imgdata[0]", "0");

-shouldBe("imgdata[1]", "0");

-shouldBe("imgdata[2]", "0");

-shouldBe("imgdata[3]", "0");

+test(function(t) {

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

+ canvas.width = 10;

+ canvas.height = 10;

+ var ctx = canvas.getContext('2d');

+ ctx.globalCompositeOperation = 'copy';

+ ctx.fillStyle = '#0f0';

+ ctx.fillRect(0, 0, 10, 10);

+ ctx.drawImage(canvas, 0, 0, 10, 10, 0, 0, 5, 5);

+ var imageData = ctx.getImageData(0, 0, 1, 1);

+ var imgdata = imageData.data;

+ assert_equals(imgdata[0], 0);

+ assert_equals(imgdata[1], 255);

+ assert_equals(imgdata[2], 0);

+ assert_equals(imgdata[3], 255);

+ imageData = ctx.getImageData(4, 4, 1, 1);

+ imgdata = imageData.data;

+ assert_equals(imgdata[0], 0);

+ assert_equals(imgdata[1], 255);

+ assert_equals(imgdata[2], 0);

+ assert_equals(imgdata[3], 255);

+ imageData = ctx.getImageData(4, 5, 1, 1);

+ imgdata = imageData.data;

+ assert_equals(imgdata[0], 0);

+ assert_equals(imgdata[1], 0);

+ assert_equals(imgdata[2], 0);

+ assert_equals(imgdata[3], 0);

+ imageData = ctx.getImageData(5, 4, 1, 1);

+ imgdata = imageData.data;

+ assert_equals(imgdata[0], 0);

+ assert_equals(imgdata[1], 0);

+ assert_equals(imgdata[2], 0);

+ assert_equals(imgdata[3], 0);

+}, 'Tests drawImage with self as source image, copy composite operation, and downsized destination rect. Regression test for issue crbug.com/330711');

</script>

</body>

-</html>