| Index: third_party/WebKit/LayoutTests/fast/canvas/canvas-large-pattern.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-large-pattern.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-large-pattern.html
|
| index 1ba4fa6af3d2f86239f0f596c519caca6fc96e28..c766406c0a9ee90dcac99a6cb43c351fc15bc090 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-large-pattern.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-large-pattern.html
|
| @@ -1,47 +1,28 @@
|
| -<!DOCTYPE HTML>
|
| -<html>
|
| -<body>
|
| - <script src="../../resources/js-test.js"></script>
|
| - <script type="text/javascript">
|
| +<script src="../../resources/testharness.js"></script>
|
| +<script src="../../resources/testharnessreport.js"></script>
|
| +<script>
|
|
|
| - description("Verifies createPattern using a source image that is a canvas 40k pixels wide.");
|
| - // This test does not currently succeed because skia does not handle
|
| - // canvases more than 32k pixels wide. For now, this test serves the
|
| - // purpose of verifying that this use case does not crash the browser.
|
| - // Crasher bug: crbug.com/281504
|
| +test(function(t) {
|
| + var canvas = document.createElement('canvas');
|
| + canvas.width = 40000;
|
| + var context = canvas.getContext('2d');
|
| + context.fillStyle = '#0f0';
|
| + context.fillRect(0, 0, 1, 1);
|
|
|
| - var canvas = document.createElement('canvas');
|
| - canvas.width = 40000;
|
| - var context = canvas.getContext('2d');
|
| - context.fillStyle = '#0f0';
|
| - context.fillRect(0, 0, 1, 1);
|
| + var dstCanvas = document.createElement('canvas');
|
| + var dstContext = dstCanvas.getContext('2d');
|
| + var pattern = dstContext.createPattern(canvas, 'repeat');
|
| + dstContext.fillStyle = pattern;
|
| + dstContext.fillRect(0, 0, dstCanvas.width, dstCanvas.height);
|
|
|
| - var dstCanvas = document.createElement('canvas');
|
| - var dstContext = dstCanvas.getContext('2d');
|
| - var pattern = dstContext.createPattern(canvas, 'repeat');
|
| - dstContext.fillStyle = pattern;
|
| - dstContext.fillRect(0, 0, dstCanvas.width, dstCanvas.height);
|
| -
|
| - var imageData = dstContext.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");
|
| -
|
| - imageData = dstContext.getImageData(1, 0, 1, 1);
|
| - imgdata = imageData.data;
|
| - shouldBe("imgdata[0]", "0");
|
| - shouldBe("imgdata[1]", "0");
|
| - shouldBe("imgdata[2]", "0");
|
| - shouldBe("imgdata[3]", "0");
|
| -
|
| - imageData = dstContext.getImageData(0, 1, 1, 1);
|
| - imgdata = imageData.data;
|
| - shouldBe("imgdata[0]", "0");
|
| - shouldBe("imgdata[1]", "0");
|
| - shouldBe("imgdata[2]", "0");
|
| - shouldBe("imgdata[3]", "0");
|
| - </script>
|
| -</body>
|
| -</html>
|
| + // This test does not currently succeed because skia does not handle
|
| + // canvases more than 32k pixels wide. For now, this test serves the
|
| + // purpose of verifying that this use case does not crash the browser.
|
| + // Crasher bug: crbug.com/281504.
|
| + assert_array_equals(dstContext.getImageData(0, 0, 1, 1).data, [0, 255, 0, 255]);
|
| +
|
| + assert_array_equals(dstContext.getImageData(1, 0, 1, 1).data, [0, 0, 0, 0]);
|
| + assert_array_equals(dstContext.getImageData(0, 1, 1, 1).data, [0, 0, 0, 0]);
|
| +
|
| +}, 'Tests createPattern using a source image that is a canvas 40k pixels wide.');
|
| +</script>
|
|
|