| OLD | NEW |
| 1 <!DOCTYPE HTML> | 1 <!DOCTYPE HTML> |
| 2 <head> | 2 <head> |
| 3 <title>Canvas test: drawSystemFocusRing</title> | 3 <title>Canvas test: drawFocusIfNeeded</title> |
| 4 <script src="../../resources/js-test.js"></script> | 4 <script src="../../resources/js-test.js"></script> |
| 5 </head> | 5 </head> |
| 6 <body style="padding: 0; margin: 0"> | 6 <body style="padding: 0; margin: 0"> |
| 7 <canvas id="canvas" class="output" width="300" height="350"> | 7 <canvas id="canvas" class="output" width="300" height="350"> |
| 8 <button id="button1"></button> | 8 <button id="button1"></button> |
| 9 <button id="button2"></button> | 9 <button id="button2"></button> |
| 10 </canvas> | 10 </canvas> |
| 11 <script> | 11 <script> |
| 12 if (window.testRunner) | 12 if (window.testRunner) |
| 13 testRunner.dumpAsText(); | 13 testRunner.dumpAsText(); |
| 14 | 14 |
| 15 var canvas = document.getElementById("canvas").getContext("2d"); | 15 var canvas = document.getElementById("canvas").getContext("2d"); |
| 16 | 16 |
| 17 document.getElementById("button1").addEventListener('focus', function() { | 17 document.getElementById("button1").addEventListener('focus', function() { |
| 18 canvas.beginPath(); | 18 canvas.beginPath(); |
| 19 canvas.rect(50, 50, 200, 100); | 19 canvas.rect(50, 50, 200, 100); |
| 20 canvas.fillStyle = "#ccf"; | 20 canvas.fillStyle = "#ccf"; |
| 21 canvas.fill(); | 21 canvas.fill(); |
| 22 canvas.drawSystemFocusRing(document.getElementById("button1")); | 22 canvas.drawFocusIfNeeded(document.getElementById("button1")); |
| 23 | 23 |
| 24 canvas.beginPath(); | 24 canvas.beginPath(); |
| 25 canvas.rect(50, 200, 200, 100); | 25 canvas.rect(50, 200, 200, 100); |
| 26 canvas.fillStyle = "#cfc"; | 26 canvas.fillStyle = "#cfc"; |
| 27 canvas.fill(); | 27 canvas.fill(); |
| 28 canvas.drawSystemFocusRing(document.getElementById("button2")); | 28 canvas.drawFocusIfNeeded(document.getElementById("button2")); |
| 29 }); | 29 }); |
| 30 | 30 |
| 31 document.getElementById("button1").focus(); | 31 document.getElementById("button1").focus(); |
| 32 | 32 |
| 33 // The top rect's focus ring is tied to button1, which is focused. | 33 // The top rect's focus ring is tied to button1, which is focused. |
| 34 // It should have an outline in some color other than the background color. | 34 // It should have an outline in some color other than the background color. |
| 35 var imageData = canvas.getImageData(49, 50, 1, 1); | 35 var imageData = canvas.getImageData(49, 50, 1, 1); |
| 36 var data = imageData.data; | 36 var data = imageData.data; |
| 37 shouldBe("data[0] != 0 || data[1] != 0 || data[2] != 0", "true"); | 37 shouldBe("data[0] != 0 || data[1] != 0 || data[2] != 0", "true"); |
| 38 | 38 |
| 39 // The bottom rect"s focus ring is tied to button2, which is not focused. | 39 // The bottom rect"s focus ring is tied to button2, which is not focused. |
| 40 imageData = canvas.getImageData(49, 200, 1, 1); | 40 imageData = canvas.getImageData(49, 200, 1, 1); |
| 41 data = imageData.data; | 41 data = imageData.data; |
| 42 shouldBe("data[0] == 0 && data[1] == 0 && data[2] == 0", "true"); | 42 shouldBe("data[0] == 0 && data[1] == 0 && data[2] == 0", "true"); |
| 43 </script> | 43 </script> |
| 44 </body> | 44 </body> |
| OLD | NEW |