| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <title>Service Worker: FetchEvent for resources</title> | 2 <title>Service Worker: FetchEvent for resources</title> |
| 3 <script src="../resources/testharness.js"></script> | 3 <script src="../resources/testharness.js"></script> |
| 4 <script src="../resources/testharnessreport.js"></script> | 4 <script src="../resources/testharnessreport.js"></script> |
| 5 <script src="../resources/get-host-info.js"></script> | 5 <script src="../resources/get-host-info.js"></script> |
| 6 <script src="resources/test-helpers.js?pipe=sub"></script> | 6 <script src="resources/test-helpers.js?pipe=sub"></script> |
| 7 <script> | 7 <script> |
| 8 var url_count = 0; | 8 var url_count = 0; |
| 9 var expected_results = {}; | 9 var expected_results = {}; |
| 10 | 10 |
| 11 function image_test(frame, url, cross_origin, expected_context, | 11 function image_test(frame, url, cross_origin, expected_context, |
| 12 expexted_mode, expected_credentials) { | 12 expexted_mode, expected_credentials) { |
| 13 var actual_url = url + (++url_count); | 13 var actual_url = url + (++url_count); |
| 14 expected_results[actual_url] = { | 14 expected_results[actual_url] = { |
| 15 cross_origin: cross_origin, | 15 cross_origin: cross_origin, |
| 16 context: expected_context, | 16 context: expected_context, |
| 17 mode: expexted_mode, | 17 mode: expexted_mode, |
| 18 credentials: expected_credentials, | 18 credentials: expected_credentials, |
| 19 redirect: 'follow', |
| 19 message: 'Image load (url:' + | 20 message: 'Image load (url:' + |
| 20 actual_url + ' cross_origin:' + cross_origin + ')' | 21 actual_url + ' cross_origin:' + cross_origin + ')' |
| 21 }; | 22 }; |
| 22 return frame.contentWindow.load_image(actual_url, cross_origin); | 23 return frame.contentWindow.load_image(actual_url, cross_origin); |
| 23 } | 24 } |
| 24 | 25 |
| 25 function script_test(frame, url, cross_origin, expected_context, | 26 function script_test(frame, url, cross_origin, expected_context, |
| 26 expexted_mode, expected_credentials) { | 27 expexted_mode, expected_credentials) { |
| 27 var actual_url = url + (++url_count); | 28 var actual_url = url + (++url_count); |
| 28 expected_results[actual_url] = { | 29 expected_results[actual_url] = { |
| 29 cross_origin: cross_origin, | 30 cross_origin: cross_origin, |
| 30 context: expected_context, | 31 context: expected_context, |
| 31 mode: expexted_mode, | 32 mode: expexted_mode, |
| 32 credentials: expected_credentials, | 33 credentials: expected_credentials, |
| 34 redirect: 'follow', |
| 33 message: 'Script load (url:' + | 35 message: 'Script load (url:' + |
| 34 actual_url + ' cross_origin:' + cross_origin + ')' | 36 actual_url + ' cross_origin:' + cross_origin + ')' |
| 35 }; | 37 }; |
| 36 return frame.contentWindow.load_script(actual_url, cross_origin); | 38 return frame.contentWindow.load_script(actual_url, cross_origin); |
| 37 } | 39 } |
| 38 | 40 |
| 39 function css_test(frame, url, cross_origin, expected_context, | 41 function css_test(frame, url, cross_origin, expected_context, |
| 40 expexted_mode, expected_credentials) { | 42 expexted_mode, expected_credentials) { |
| 41 var actual_url = url + (++url_count); | 43 var actual_url = url + (++url_count); |
| 42 expected_results[actual_url] = { | 44 expected_results[actual_url] = { |
| 43 cross_origin: cross_origin, | 45 cross_origin: cross_origin, |
| 44 context: expected_context, | 46 context: expected_context, |
| 45 mode: expexted_mode, | 47 mode: expexted_mode, |
| 46 credentials: expected_credentials, | 48 credentials: expected_credentials, |
| 49 redirect: 'follow', |
| 47 message: 'CSS load (url:' + | 50 message: 'CSS load (url:' + |
| 48 actual_url + ' cross_origin:' + cross_origin + ')' | 51 actual_url + ' cross_origin:' + cross_origin + ')' |
| 49 }; | 52 }; |
| 50 return frame.contentWindow.load_css(actual_url, cross_origin); | 53 return frame.contentWindow.load_css(actual_url, cross_origin); |
| 51 } | 54 } |
| 52 | 55 |
| 53 function font_face_test(frame, url, expected_context, expexted_mode, | 56 function font_face_test(frame, url, expected_context, expexted_mode, |
| 54 expected_credentials) { | 57 expected_credentials) { |
| 55 var actual_url = url + (++url_count); | 58 var actual_url = url + (++url_count); |
| 56 expected_results[actual_url] = { | 59 expected_results[actual_url] = { |
| 57 url: actual_url, | 60 url: actual_url, |
| 58 context: expected_context, | 61 context: expected_context, |
| 59 mode: expexted_mode, | 62 mode: expexted_mode, |
| 60 credentials: expected_credentials, | 63 credentials: expected_credentials, |
| 64 redirect: 'follow', |
| 61 message: 'FontFace load (url:' + actual_url + ')' | 65 message: 'FontFace load (url:' + actual_url + ')' |
| 62 }; | 66 }; |
| 63 return frame.contentWindow.load_font(actual_url); | 67 return frame.contentWindow.load_font(actual_url); |
| 64 } | 68 } |
| 65 | 69 |
| 66 function css_image_test(frame, url, type, expected_context, | 70 function css_image_test(frame, url, type, expected_context, |
| 67 expexted_mode, expected_credentials) { | 71 expexted_mode, expected_credentials) { |
| 68 var actual_url = url + (++url_count); | 72 var actual_url = url + (++url_count); |
| 69 expected_results[actual_url] = { | 73 expected_results[actual_url] = { |
| 70 url: actual_url, | 74 url: actual_url, |
| 71 context: expected_context, | 75 context: expected_context, |
| 72 mode: expexted_mode, | 76 mode: expexted_mode, |
| 73 credentials: expected_credentials, | 77 credentials: expected_credentials, |
| 78 redirect: 'follow', |
| 74 message: 'CSSImage load (url:' + actual_url + ' type:' + type + ')' | 79 message: 'CSSImage load (url:' + actual_url + ' type:' + type + ')' |
| 75 }; | 80 }; |
| 76 return frame.contentWindow.load_css_image(actual_url, type); | 81 return frame.contentWindow.load_css_image(actual_url, type); |
| 77 } | 82 } |
| 78 | 83 |
| 79 function css_image_set_test(frame, url, type, expected_context, | 84 function css_image_set_test(frame, url, type, expected_context, |
| 80 expexted_mode, expected_credentials) { | 85 expexted_mode, expected_credentials) { |
| 81 var actual_url = url + (++url_count); | 86 var actual_url = url + (++url_count); |
| 82 expected_results[actual_url] = { | 87 expected_results[actual_url] = { |
| 83 url: actual_url, | 88 url: actual_url, |
| 84 context: expected_context, | 89 context: expected_context, |
| 85 mode: expexted_mode, | 90 mode: expexted_mode, |
| 86 credentials: expected_credentials, | 91 credentials: expected_credentials, |
| 92 redirect: 'follow', |
| 87 message: 'CSSImageSet load (url:' + actual_url + ' type:' + type + ')' | 93 message: 'CSSImageSet load (url:' + actual_url + ' type:' + type + ')' |
| 88 }; | 94 }; |
| 89 return frame.contentWindow.load_css_image_set(actual_url, type); | 95 return frame.contentWindow.load_css_image_set(actual_url, type); |
| 90 } | 96 } |
| 91 | 97 |
| 92 async_test(function(t) { | 98 async_test(function(t) { |
| 93 var SCOPE = 'resources/fetch-request-resources-iframe.html'; | 99 var SCOPE = 'resources/fetch-request-resources-iframe.html'; |
| 94 var SCRIPT = 'resources/fetch-request-resources-worker.js'; | 100 var SCRIPT = 'resources/fetch-request-resources-worker.js'; |
| 95 var host_info = get_host_info(); | 101 var host_info = get_host_info(); |
| 96 var LOCAL_URL = | 102 var LOCAL_URL = |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 result.context_new, '', | 135 result.context_new, '', |
| 130 'context of new Request() must be the empty string'); | 136 'context of new Request() must be the empty string'); |
| 131 assert_equals( | 137 assert_equals( |
| 132 result.mode, expected.mode, | 138 result.mode, expected.mode, |
| 133 'mode of ' + expected.message + ' must be ' + | 139 'mode of ' + expected.message + ' must be ' + |
| 134 expected.mode + '.'); | 140 expected.mode + '.'); |
| 135 assert_equals( | 141 assert_equals( |
| 136 result.credentials, expected.credentials, | 142 result.credentials, expected.credentials, |
| 137 'credentials of ' + expected.message + ' must be ' + | 143 'credentials of ' + expected.message + ' must be ' + |
| 138 expected.credentials + '.'); | 144 expected.credentials + '.'); |
| 145 assert_equals( |
| 146 result.redirect, expected.redirect, |
| 147 'redirect mode of ' + expected.message + ' must be ' + |
| 148 expected.redirect + '.'); |
| 139 --url_count; | 149 --url_count; |
| 140 delete expected_results[result.url]; | 150 delete expected_results[result.url]; |
| 141 if (url_count == 0) { | 151 if (url_count == 0) { |
| 142 frame.remove(); | 152 frame.remove(); |
| 143 service_worker_unregister_and_done(t, SCOPE); | 153 service_worker_unregister_and_done(t, SCOPE); |
| 144 } | 154 } |
| 145 }); | 155 }); |
| 146 worker.postMessage( | 156 worker.postMessage( |
| 147 {port: channel.port2}, [channel.port2]); | 157 {port: channel.port2}, [channel.port2]); |
| 148 }); | 158 }); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 'no-cors', 'same-origin'); | 205 'no-cors', 'same-origin'); |
| 196 css_image_set_test(f, LOCAL_URL, 'shapeOutside', 'image', 'cors', | 206 css_image_set_test(f, LOCAL_URL, 'shapeOutside', 'image', 'cors', |
| 197 'omit'); | 207 'omit'); |
| 198 css_image_set_test(f, REMOTE_URL, 'shapeOutside', 'image', 'cors', | 208 css_image_set_test(f, REMOTE_URL, 'shapeOutside', 'image', 'cors', |
| 199 'omit'); | 209 'omit'); |
| 200 | 210 |
| 201 }) | 211 }) |
| 202 .catch(unreached_rejection(t)); | 212 .catch(unreached_rejection(t)); |
| 203 }, 'Verify FetchEvent for resources.'); | 213 }, 'Verify FetchEvent for resources.'); |
| 204 </script> | 214 </script> |
| OLD | NEW |