| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <title>Service Worker: postMessage to Client</title> | 2 <title>Service Worker: postMessage to Client</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/test-helpers.js"></script> | 5 <script src="resources/test-helpers.js"></script> |
| 6 <script> | 6 <script> |
| 7 var t = async_test('postMessage MessagePorts from ServiceWorker to Client'); | 7 var t = async_test('postMessage MessagePorts from ServiceWorker to Client'); |
| 8 t.step(function() { | 8 t.step(function() { |
| 9 var scope = 'resources/blank.html' | 9 var scope = 'resources/blank.html' |
| 10 service_worker_unregister_and_register( | 10 service_worker_unregister_and_register( |
| 11 t, 'resources/postmessage-msgport-to-client-worker.js', scope, | 11 t, 'resources/postmessage-msgport-to-client-worker.js', scope, |
| 12 onRegister); | 12 onRegister); |
| 13 | 13 |
| 14 function onRegister(worker) { | 14 function onRegister(worker) { |
| 15 worker.addEventListener('statechange', t.step_func(function(event) { | 15 worker.addEventListener('statechange', t.step_func(function(event) { |
| 16 if (event.target.state == 'active') | 16 if (event.target.state == 'active') |
| 17 onActive(); | 17 onActive(); |
| 18 })); | 18 })); |
| 19 } | 19 } |
| 20 | 20 |
| 21 function onActive() { | 21 function onActive() { |
| 22 with_iframe(scope, t.step_func(function(frame) { | 22 with_iframe(scope, t.step_func(function(frame) { |
| 23 var w = frame.contentWindow; | 23 var w = frame.contentWindow; |
| 24 w.onmessage = t.step_func(onMessage); | 24 w.onmessage = t.step_func(onMessage); |
| 25 w.navigator.serviceWorker.current.postMessage('ping'); | 25 w.navigator.serviceWorker.controller.postMessage('ping'); |
| 26 })); | 26 })); |
| 27 } | 27 } |
| 28 | 28 |
| 29 var result = []; | 29 var result = []; |
| 30 var expected = [ | 30 var expected = [ |
| 31 'Acking value: 1', | 31 'Acking value: 1', |
| 32 'Acking value: 2', | 32 'Acking value: 2', |
| 33 ]; | 33 ]; |
| 34 | 34 |
| 35 function onMessage(e) { | 35 function onMessage(e) { |
| 36 var message = e.data; | 36 var message = e.data; |
| 37 if ('port' in message) { | 37 if ('port' in message) { |
| 38 var port = message.port; | 38 var port = message.port; |
| 39 port.postMessage({value: 1}); | 39 port.postMessage({value: 1}); |
| 40 port.postMessage({value: 2}); | 40 port.postMessage({value: 2}); |
| 41 port.postMessage({done: true}); | 41 port.postMessage({done: true}); |
| 42 } else if ('ack' in message) { | 42 } else if ('ack' in message) { |
| 43 result.push(message.ack); | 43 result.push(message.ack); |
| 44 } else if ('done' in message) { | 44 } else if ('done' in message) { |
| 45 assert_array_equals(result, expected, 'Worker should post back expec
ted values via MessagePort.'); | 45 assert_array_equals(result, expected, 'Worker should post back expec
ted values via MessagePort.'); |
| 46 service_worker_unregister_and_done(t, scope); | 46 service_worker_unregister_and_done(t, scope); |
| 47 } else { | 47 } else { |
| 48 assert_unreached('Got unexpected message from ServiceWorker'); | 48 assert_unreached('Got unexpected message from ServiceWorker'); |
| 49 } | 49 } |
| 50 } | 50 } |
| 51 }); | 51 }); |
| 52 </script> | 52 </script> |
| OLD | NEW |