Index: third_party/WebKit/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html |
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html |
index a73061f2a3a1140d0938cbc55da8112815823ed1..4f81ce87ab8c5af7178b4d341b1d01815930000a 100644 |
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html |
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html |
@@ -1,10 +1,60 @@ |
-<!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-fillText-invalid-maxWidth.js"></script> |
+<script> |
+test(function(t) { |
+ |
+ var canvas = document.createElement('canvas'); |
+ var ctx = canvas.getContext('2d'); |
+ var canvasWidth = 100; |
+ var canvasHeight = 50; |
+ canvas.setWidth = canvasWidth; |
+ canvas.setHeight = canvasHeight; |
+ |
+ ctx.fillStyle = '#0f0'; |
+ ctx.fillRect(0, 0, canvasWidth, canvasHeight); |
+ ctx.font = '35px Arial, sans-serif'; |
+ |
+ ctx.fillStyle = '#f00'; |
+ ctx.fillText("fail fail fail fail fail", 5, 35, 0); |
+ |
+ var imageData = ctx.getImageData(0, 0, canvasWidth, canvasHeight); |
+ var w = imageData.width, h = imageData.height, d = imageData.data; |
+ var pixelsCheck = true; |
+ loopMain1: |
+ for (var i = 0; i < h; ++i) { |
+ for (var j = 0; j < w; ++j) { |
+ if (d[4 * (w * i + j) + 0] != 0) pixelsCheck = false; |
+ if (d[4 * (w * i + j) + 1] != 255) pixelsCheck = false; |
+ if (d[4 * (w * i + j) + 2] != 0) pixelsCheck = false; |
+ if (d[4 * (w * i + j) + 3] != 255) pixelsCheck = false; |
+ if(!pixelsCheck) break loopMain1; |
+ } |
+ } |
+ assert_true(pixelsCheck); |
+ |
+ ctx.fillStyle = '#0f0'; |
+ ctx.fillRect(0, 0, canvasWidth, canvasHeight); |
+ |
+ ctx.fillStyle = '#f00'; |
+ ctx.fillText("fail fail fail fail fail", 5, 35, -1); |
+ |
+ var imageData = ctx.getImageData(0, 0, canvasWidth, canvasHeight); |
+ var w = imageData.width, h = imageData.height, d = imageData.data; |
+ pixelsCheck = true; |
+ loopMain2: |
+ for (var i = 0; i < h; ++i) { |
+ for (var j = 0; j < w; ++j) { |
+ if (d[4 * (w * i + j) + 0] != 0) pixelsCheck = false; |
+ if (d[4 * (w * i + j) + 1] != 255) pixelsCheck = false; |
+ if (d[4 * (w * i + j) + 2] != 0) pixelsCheck = false; |
+ if (d[4 * (w * i + j) + 3] != 255) pixelsCheck = false; |
+ if(!pixelsCheck) break loopMain2; |
+ } |
+ } |
+ assert_true(pixelsCheck); |
+ |
+}, 'Series of tests to ensure that fillText() does not display any text when maxWidth is invalid.'); |
+</script> |
</body> |
-</html> |