| OLD | NEW |
|---|
| 1 <!DOCTYPE HTML> | 1 <!DOCTYPE HTML> |
| 2 <head> | 2 <head> |
| 3 <title>Canvas test: drawSystemFocusRing</title> | 3 <title>Canvas test: drawSystemFocusRing</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 document.getElementById("button1").focus(); | 15 document.getElementById("button1").focus(); |
| 16 | 16 |
| 17 var canvas = document.getElementById("canvas").getContext("2d"); | 17 var canvas = document.getElementById("canvas").getContext("2d"); |
| 18 |
| 19 shouldNotThrow('canvas.drawSystemFocusRing(null);'); |
| 20 shouldThrow('canvas.drawSystemFocusRing();'); |
| 21 |
| 18 canvas.beginPath(); | 22 canvas.beginPath(); |
| 19 canvas.rect(50, 50, 200, 100); | 23 canvas.rect(50, 50, 200, 100); |
| 20 canvas.fillStyle = "#ccf"; | 24 canvas.fillStyle = "#ccf"; |
| 21 canvas.fill(); | 25 canvas.fill(); |
| 26 // re-test null case after having defined a path (regression test for crbug.com/
353248) |
| 27 shouldNotThrow('canvas.drawSystemFocusRing(null);'); |
| 22 canvas.drawSystemFocusRing(document.getElementById("button1")); | 28 canvas.drawSystemFocusRing(document.getElementById("button1")); |
| 23 | 29 |
| 24 canvas.beginPath(); | 30 canvas.beginPath(); |
| 25 canvas.rect(50, 200, 200, 100); | 31 canvas.rect(50, 200, 200, 100); |
| 26 canvas.fillStyle = "#cfc"; | 32 canvas.fillStyle = "#cfc"; |
| 27 canvas.fill(); | 33 canvas.fill(); |
| 28 canvas.drawSystemFocusRing(document.getElementById("button2")); | 34 canvas.drawSystemFocusRing(document.getElementById("button2")); |
| 29 | 35 |
| 30 // The top rect"s focus ring is tied to button1, which is focused. | 36 // The top rect"s focus ring is tied to button1, which is focused. |
| 31 // It should have an outline in some color other than the background color. | 37 // It should have an outline in some color other than the background color. |
| 32 var imageData = canvas.getImageData(49, 50, 1, 1); | 38 var imageData = canvas.getImageData(49, 50, 1, 1); |
| 33 var data = imageData.data; | 39 var data = imageData.data; |
| 34 shouldBe("data[0] != 0 || data[1] != 0 || data[2] != 0", "true"); | 40 shouldBe("data[0] != 0 || data[1] != 0 || data[2] != 0", "true"); |
| 35 | 41 |
| 36 // The bottom rect"s focus ring is tied to button2, which is not focused. | 42 // The bottom rect"s focus ring is tied to button2, which is not focused. |
| 37 imageData = canvas.getImageData(49, 200, 1, 1); | 43 imageData = canvas.getImageData(49, 200, 1, 1); |
| 38 data = imageData.data; | 44 data = imageData.data; |
| 39 shouldBe("data[0] == 0 && data[1] == 0 && data[2] == 0", "true"); | 45 shouldBe("data[0] == 0 && data[1] == 0 && data[2] == 0", "true"); |
| 40 </script> | 46 </script> |
| 41 </body> | 47 </body> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 203293005:
Fix crash in 2D canvas drawSystemFocusRing with invalid argument. (Closed)
Base URL: svn://svn.chromium.org/blink/trunk