Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/LayoutTests/fast/canvas/canvas-hit-regions-fill-rule-test.html

Issue 2679193002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests. (Closed)
Patch Set: Addressing comments Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/canvas-hit-regions-clear-test-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/canvas-hit-regions-fill-rule-test-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <script src='../../resources/testharness.js'></script>
2 <html> 2 <script src='../../resources/testharnessreport.js'></script>
3 <head>
4 <title>Canvas Hit Regions: fillRule test</title>
5 <script src="../../resources/js-test.js"></script>
6 </head>
7 <body> 3 <body>
8 <canvas id="canvas" width="400" height="400"> 4 <canvas id='canvas' width='400' height='400'>
9 </canvas> 5 </canvas>
10 <script src="./resources/canvas-hit-region-event.js"></script> 6 <script src='./resources/canvas-hit-region-event.js'></script>
11 <script> 7 <script>
8 test(function(t) {
12 9
13 var canvas = document.getElementById("canvas"); 10 var canvas = document.getElementById('canvas');
14 var context = canvas.getContext("2d"); 11 var context = canvas.getContext('2d');
15 12
16 context.rect(20, 20, 60, 60); 13 context.rect(20, 20, 60, 60);
17 context.rect(0, 0, 100, 100); 14 context.rect(0, 0, 100, 100);
18 context.addHitRegion({ 15 context.addHitRegion({
19 id : "nonzero" 16 id : 'nonzero'
20 // default fillRule 17 // default fillRule
21 }); 18 });
22 19
23 debug("default fillRule(nonzero):"); 20 // default fillRule(nonzero)
24 shouldBe("clickCanvas(1, 1)", "'nonzero'"); 21 assert_equals(clickCanvas(1, 1), 'nonzero');
25 shouldBe("clickCanvas(99, 98)", "'nonzero'"); 22 assert_equals(clickCanvas(99, 98), 'nonzero');
26 shouldBe("clickCanvas(21, 21)", "'nonzero'"); 23 assert_equals(clickCanvas(21, 21), 'nonzero');
27 shouldBe("clickCanvas(50, 50)", "'nonzero'"); 24 assert_equals(clickCanvas(50, 50), 'nonzero');
28 debug("");
29 25
30 context.removeHitRegion("nonzero"); 26 context.removeHitRegion('nonzero');
31 27
32 context.addHitRegion({ 28 context.addHitRegion({
33 id : "evenodd", 29 id : 'evenodd',
34 fillRule : "evenodd" 30 fillRule : 'evenodd'
35 }); 31 });
36 32
37 debug("fillRule = evenodd:"); 33 // fillRule = evenodd
38 shouldBe("clickCanvas(1, 1)", "'evenodd'"); 34 assert_equals(clickCanvas(1, 1), 'evenodd');
39 shouldBe("clickCanvas(99, 98)", "'evenodd'"); 35 assert_equals(clickCanvas(99, 98), 'evenodd');
40 shouldBe("clickCanvas(21, 21)", "null"); 36 assert_equals(clickCanvas(21, 21), null);
41 shouldBe("clickCanvas(50, 50)", "null"); 37 assert_equals(clickCanvas(50, 50), null);
42 debug("");
43 38
44 context.removeHitRegion("evenodd"); 39 context.removeHitRegion('evenodd');
45 40
46 context.addHitRegion({ 41 context.addHitRegion({
47 id : "nonzero", 42 id : 'nonzero',
48 fillRule : "nonzero" 43 fillRule : 'nonzero'
49 }); 44 });
50 45
51 debug("fillRule = nonzero:"); 46 // fillRule = nonzero
52 shouldBe("clickCanvas(1, 1)", "'nonzero'"); 47 assert_equals(clickCanvas(1, 1), 'nonzero');
53 shouldBe("clickCanvas(99, 98)", "'nonzero'"); 48 assert_equals(clickCanvas(99, 98), 'nonzero');
54 shouldBe("clickCanvas(21, 21)", "'nonzero'"); 49 assert_equals(clickCanvas(21, 21), 'nonzero');
55 shouldBe("clickCanvas(50, 50)", "'nonzero'"); 50 assert_equals(clickCanvas(50, 50), 'nonzero');
56 debug("");
57 51
58 context.removeHitRegion("nonzero"); 52 context.removeHitRegion('nonzero');
59 53
60 shouldThrow('context.addHitRegion({id : "nonzero", fillRule : null });'); 54 assert_throws(null, function() {context.addHitRegion({id : 'nonzero', fillRule : null });});
61 55
62 context.addHitRegion({ 56 context.addHitRegion({
63 id : "nonzero", 57 id : 'nonzero',
64 fillRule : undefined 58 fillRule : undefined
65 }); 59 });
66 60
67 debug("fillRule = undefined, falls back to default (nonzero):"); 61 // fillRule = undefined, falls back to default (nonzero):');
68 shouldBe("clickCanvas(1, 1)", "'nonzero'"); 62 assert_equals(clickCanvas(1, 1), 'nonzero');
69 shouldBe("clickCanvas(99, 98)", "'nonzero'"); 63 assert_equals(clickCanvas(99, 98), 'nonzero');
70 shouldBe("clickCanvas(21, 21)", "'nonzero'"); 64 assert_equals(clickCanvas(21, 21), 'nonzero');
71 shouldBe("clickCanvas(50, 50)", "'nonzero'"); 65 assert_equals(clickCanvas(50, 50), 'nonzero');
72 debug("");
73 66
67 }, 'Canvas Hit Regions: fillRule test');
74 </script> 68 </script>
75 </body> 69 </body>
76 </html>
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/canvas-hit-regions-clear-test-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/canvas-hit-regions-fill-rule-test-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698