| Index: third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-with-path2d.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-with-path2d.html b/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-with-path2d.html
|
| index 24731b8fdb5cc620a9a2615a06f123e2c8394da3..479a692ec389ead5ed8e12ad13d0f7da5cdccc7c 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-with-path2d.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-with-path2d.html
|
| @@ -1,51 +1,50 @@
|
| -<!DOCTYPE HTML>
|
| -<head>
|
| -<title>Canvas test: drawFocusIfNeeded with Path2D</title>
|
| -<script src="../../resources/js-test.js"></script>
|
| -</head>
|
| -<body style="padding: 0; margin: 0">
|
| +<script src="../../resources/testharness.js"></script>
|
| +<script src="../../resources/testharnessreport.js"></script>
|
| +
|
| <canvas id="canvas" class="output" width="300" height="350">
|
| <button id="button1"></button>
|
| <button id="button2"></button>
|
| </canvas>
|
| -<script>
|
| -if (window.testRunner)
|
| - testRunner.dumpAsText();
|
| -
|
| -document.getElementById("button1").focus();
|
| -
|
| -var canvas = document.getElementById("canvas").getContext("2d");
|
|
|
| -shouldThrow('canvas.drawFocusIfNeeded(undefined);');
|
| -shouldThrow('canvas.drawFocusIfNeeded(undefined, undefined);');
|
| -shouldThrow('canvas.drawFocusIfNeeded(null);');
|
| -shouldThrow('canvas.drawFocusIfNeeded(null, null);');
|
| -shouldThrow('canvas.drawFocusIfNeeded();');
|
| -
|
| -var path = new Path2D();
|
| -path.rect(50, 50, 200, 100);
|
| -canvas.fillStyle = "#ccf";
|
| -canvas.fill(path);
|
| -// re-test null case after having defined a path (regression test for crbug.com/353248)
|
| -shouldThrow('canvas.drawFocusIfNeeded(null);');
|
| -shouldThrow('canvas.drawFocusIfNeeded(null, null);');
|
| -canvas.drawFocusIfNeeded(path, document.getElementById("button1"));
|
| -
|
| -path = new Path2D();
|
| -path.rect(50, 200, 200, 100);
|
| -canvas.fillStyle = "#cfc";
|
| -canvas.fill(path);
|
| -canvas.drawFocusIfNeeded(path, document.getElementById("button2"));
|
| -
|
| -// The top rect"s focus ring is tied to button1, which is focused.
|
| -// It should have an outline in some color other than the background color.
|
| -var imageData = canvas.getImageData(49, 50, 1, 1);
|
| -var data = imageData.data;
|
| -shouldBe("data[0] != 0 || data[1] != 0 || data[2] != 0", "true");
|
| +<script>
|
| +test(function(t) {
|
|
|
| -// The bottom rect"s focus ring is tied to button2, which is not focused.
|
| -imageData = canvas.getImageData(49, 200, 1, 1);
|
| -data = imageData.data;
|
| -shouldBe("data[0] == 0 && data[1] == 0 && data[2] == 0", "true");
|
| + document.getElementById("button1").focus();
|
| +
|
| + var canvas = document.getElementById("canvas").getContext("2d");
|
| +
|
| + assert_throws(null, function(){canvas.drawFocusIfNeeded(undefined);});
|
| + assert_throws(null, function(){canvas.drawFocusIfNeeded(undefined, undefined);});
|
| + assert_throws(null, function(){canvas.drawFocusIfNeeded(null);});
|
| + assert_throws(null, function(){canvas.drawFocusIfNeeded(null, null);});
|
| + assert_throws(null, function(){canvas.drawFocusIfNeeded();});
|
| +
|
| + var path = new Path2D();
|
| + path.rect(50, 50, 200, 100);
|
| + canvas.fillStyle = "#ccf";
|
| + canvas.fill(path);
|
| + // re-test null case after having defined a path (regression test for crbug.com/353248)
|
| + assert_throws(null, function(){canvas.drawFocusIfNeeded(null);});
|
| + assert_throws(null, function(){canvas.drawFocusIfNeeded(null, null);});
|
| + canvas.drawFocusIfNeeded(path, document.getElementById("button1"));
|
| +
|
| + path = new Path2D();
|
| + path.rect(50, 200, 200, 100);
|
| + canvas.fillStyle = "#cfc";
|
| + canvas.fill(path);
|
| + canvas.drawFocusIfNeeded(path, document.getElementById("button2"));
|
| +
|
| + // The top rect"s focus ring is tied to button1, which is focused.
|
| + // It should have an outline in some color other than the background color.
|
| + var imageData = canvas.getImageData(49, 50, 1, 1);
|
| + var data = imageData.data;
|
| + assert_true(data[0] != 0 || data[1] != 0 || data[2] != 0);
|
| +
|
| + // The bottom rect"s focus ring is tied to button2, which is not focused.
|
| + imageData = canvas.getImageData(49, 200, 1, 1);
|
| + data = imageData.data;
|
| + assert_true(data[0] == 0 && data[1] == 0 && data[2] == 0);
|
| +
|
| +}, 'Canvas test: drawFocusIfNeeded with Path2D');
|
| </script>
|
| </body>
|
|
|
Chromium Code Reviews
Issue 2700823002:
Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests. (Closed)
