| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <script src="../resources/testharness.js"></script> | 2 <script src="../resources/testharness.js"></script> |
| 3 <script src="../resources/testharnessreport.js"></script> | 3 <script src="../resources/testharnessreport.js"></script> |
| 4 <script src="resources/fake-devices.js"></script> | 4 <script src="resources/fake-devices.js"></script> |
| 5 <script src="resources/usb-helpers.js"></script> | 5 <script src="resources/usb-helpers.js"></script> |
| 6 <script src="resources/webusb-test.js"></script> | 6 <script src="resources/webusb-test.js"></script> |
| 7 <script> | 7 <script> |
| 8 'use strict'; | 8 'use strict'; |
| 9 | 9 |
| 10 function runIframeDisconnectTest(onDeviceConnected) { | 10 function runIframeDisconnectTest(onDeviceConnected) { |
| 11 return navigator.usb.test.initialize().then(() => { | 11 return navigator.usb.test.initialize().then(() => { |
| 12 return new Promise((resolve, reject) => { | 12 return new Promise((resolve, reject) => { |
| 13 let opened = false; | 13 let opened = false; |
| 14 let fakeDeviceGuid = null; | 14 let fakeDevice = null; |
| 15 | 15 |
| 16 let iframe = document.createElement('iframe'); | 16 let iframe = document.createElement('iframe'); |
| 17 iframe.src = 'resources/open-in-iframe.html'; | 17 iframe.src = 'resources/open-in-iframe.html'; |
| 18 iframe.onload = () => { | 18 iframe.onload = () => { |
| 19 navigator.usb.test.attachToWindow(iframe.contentWindow).then(() => { | 19 navigator.usb.test.attachToWindow(iframe.contentWindow).then(() => { |
| 20 iframe.contentWindow.postMessage('Ready', '*'); | 20 iframe.contentWindow.postMessage('Ready', '*'); |
| 21 }); | 21 }); |
| 22 }; | 22 }; |
| 23 | 23 |
| 24 window.onmessage = messageEvent => { | 24 window.onmessage = messageEvent => { |
| 25 if (messageEvent.data == 'Ready') { | 25 if (messageEvent.data == 'Ready') { |
| 26 fakeDeviceGuid = navigator.usb.test.addFakeDevice(fakeDeviceInit); | 26 fakeDevice = navigator.usb.test.addFakeDevice(fakeDeviceInit); |
| 27 } else if (messageEvent.data == 'Success') { | 27 } else if (messageEvent.data == 'Success') { |
| 28 opened = true; | 28 opened = true; |
| 29 onDeviceConnected(iframe); | 29 onDeviceConnected(iframe); |
| 30 } else { | 30 } else { |
| 31 reject(messageEvent.data); | 31 reject(messageEvent.data); |
| 32 } | 32 } |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 navigator.usb.test.ondeviceclose = guid => { | 35 navigator.usb.test.ondeviceclose = closedFakeDevice => { |
| 36 assert_equals(guid, fakeDeviceGuid); | 36 assert_equals(closedFakeDevice, fakeDevice); |
| 37 assert_true(opened); | 37 assert_true(opened); |
| 38 resolve(); | 38 resolve(); |
| 39 }; | 39 }; |
| 40 | 40 |
| 41 document.body.appendChild(iframe); | 41 document.body.appendChild(iframe); |
| 42 }); | 42 }); |
| 43 }); | 43 }); |
| 44 } | 44 } |
| 45 | 45 |
| 46 promise_test(() => { | 46 promise_test(() => { |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 } else { | 79 } else { |
| 80 reject(messageEvent.data); | 80 reject(messageEvent.data); |
| 81 } | 81 } |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 document.body.appendChild(iframe); | 84 document.body.appendChild(iframe); |
| 85 }); | 85 }); |
| 86 }); | 86 }); |
| 87 }, 'events are not delivered to detached frames'); | 87 }, 'events are not delivered to detached frames'); |
| 88 </script> | 88 </script> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2816663002:
Ensure tests don't depend on fake devices being added synchronously (Closed)
