OLD | NEW |
1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
2 <html> | 2 <html> |
3 <head> | 3 <head> |
4 <style> | 4 <style> |
5 #content { | 5 #content { |
6 width: 7500px; | 6 width: 7500px; |
7 height: 7500px; | 7 height: 7500px; |
8 background-color: blue; | 8 background-color: blue; |
9 } | 9 } |
10 </style> | 10 </style> |
11 <script src="../../resources/testharness.js"></script> | 11 <script src="../../resources/testharness.js"></script> |
12 <script src="../../resources/testharnessreport.js"></script> | 12 <script src="../../resources/testharnessreport.js"></script> |
13 <script src="resources/scroll-behavior-test.js"></script> | 13 <script src="resources/scroll-behavior-test.js"></script> |
14 <script type="text/javascript"> | 14 <script type="text/javascript"> |
15 function getEndPosition(testCase, startPosition) { | 15 function getEndPosition(testCase, startPosition) { |
16 var endPosition = {}; | 16 var endPosition = {}; |
17 endPosition.x = testCase.x; | 17 if (testCase.x) |
18 endPosition.y = testCase.y; | 18 endPosition.x = testCase.x; |
| 19 else |
| 20 endPosition.x = startPosition.x; |
| 21 |
| 22 if (testCase.y) |
| 23 endPosition.y = testCase.y; |
| 24 else |
| 25 endPosition.y = startPosition.y; |
| 26 |
19 return endPosition; | 27 return endPosition; |
20 } | 28 } |
21 | 29 |
22 function jsScroll(testCase) { | 30 function jsScroll(testCase) { |
23 if (testCase.js) { | 31 if (testCase.js) { |
24 window.scrollTo(testCase.x, testCase.y, {behavior: testCase.js}); | 32 var scrollToOptions = {behavior: testCase.js}; |
| 33 if (testCase.x) |
| 34 scrollToOptions.left = testCase.x; |
| 35 if (testCase.y) |
| 36 scrollToOptions.top = testCase.y; |
| 37 window.scrollTo(scrollToOptions); |
25 } else { | 38 } else { |
26 window.scrollTo(testCase.x, testCase.y); | 39 window.scrollTo(testCase.x, testCase.y); |
27 } | 40 } |
28 } | 41 } |
29 | 42 |
30 const testScrolls = [ | 43 const testScrolls = [ |
31 {js: "instant", css: "auto", x: 1, y: 2}, | 44 {js: "instant", css: "auto", x: 1, y: 2}, |
32 {js: "instant", css: "smooth", x: 2, y: 3}, | 45 {js: "instant", css: "smooth", x: 2, y: 3}, |
33 {js: "auto", css: "auto", x: 3, y: 4}, | 46 {js: "auto", css: "auto", x: 3, y: 4}, |
34 {js: "", css: "auto", x: 4, y: 5}, | 47 {js: "", css: "auto", x: 4, y: 5}, |
| 48 {js: "auto", css: "auto", x: 3}, |
| 49 {js: "auto", css: "auto", y: 4}, |
| 50 {js: "auto", css: "auto"}, |
35 {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 15}, | 51 {js: "smooth", css: "auto", waitForEnd: true, x: 10, y: 15}, |
36 {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 25}, | 52 {js: "smooth", css: "smooth", waitForEnd: true, x: 20, y: 25}, |
37 {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 35}, | 53 {js: "auto", css: "smooth", waitForEnd: true, x: 30, y: 35}, |
38 {js: "", css: "smooth", waitForEnd: true, x: 40, y: 45}, | 54 {js: "", css: "smooth", waitForEnd: true, x: 40, y: 45}, |
| 55 {js: "auto", css: "smooth", waitForEnd: true, x: 45}, |
| 56 {js: "auto", css: "smooth", waitForEnd: true, y: 40}, |
39 {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 4100}, | 57 {js: "smooth", css: "auto", waitForEnd: false, x: 4000, y: 4100}, |
40 {js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 20}, | 58 {js: "smooth", css: "smooth", waitForEnd: false, x: 15, y: 20}, |
41 {js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 4000}, | 59 {js: "auto", css: "smooth", waitForEnd: false, x: 4100, y: 4000}, |
42 {js: "", css: "smooth", waitForEnd: false, x: 10, y: 5}, | 60 {js: "", css: "smooth", waitForEnd: false, x: 10, y: 5}, |
43 ]; | 61 ]; |
44 | 62 |
45 function doTest() | 63 function doTest() |
46 { | 64 { |
47 var testCases = []; | 65 var testCases = []; |
48 for (var i = 0; i < testScrolls.length; i++) { | 66 for (var i = 0; i < testScrolls.length; i++) { |
(...skipping 10 matching lines...) Expand all Loading... |
59 | 77 |
60 window.addEventListener('load', doTest, false); | 78 window.addEventListener('load', doTest, false); |
61 </script> | 79 </script> |
62 </head> | 80 </head> |
63 | 81 |
64 <body> | 82 <body> |
65 <p>Test that calling scrollTo on the main frame works with both scroll behavio
rs</p> | 83 <p>Test that calling scrollTo on the main frame works with both scroll behavio
rs</p> |
66 <div id="content"></div> | 84 <div id="content"></div> |
67 </body> | 85 </body> |
68 </html> | 86 </html> |
OLD | NEW |