Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 var port = undefined; | 1 var port = undefined; |
| 2 var isTestTargetFetch = false; | 2 var isTestTargetFetch = false; |
| 3 | 3 |
| 4 self.onmessage = function(e) { | 4 self.onmessage = function(e) { |
| 5 var message = e.data; | 5 var message = e.data; |
| 6 if ('port' in message) { | 6 if ('port' in message) { |
| 7 port = message.port; | 7 port = message.port; |
| 8 } else if (message.msg === 'START TEST CASE') { | 8 } else if (message.msg === 'START TEST CASE') { |
| 9 isTestTargetFetch = true; | 9 isTestTargetFetch = true; |
| 10 port.postMessage({msg: 'READY'}); | 10 port.postMessage({msg: 'READY'}); |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 68 return; | 68 return; |
| 69 } | 69 } |
| 70 event.respondWith(new Promise(function(resolve, reject) { | 70 event.respondWith(new Promise(function(resolve, reject) { |
| 71 try { | 71 try { |
| 72 var request = event.request; | 72 var request = event.request; |
| 73 if (url) { | 73 if (url) { |
| 74 request = new Request(url, init); | 74 request = new Request(url, init); |
| 75 } else if (!params['noChange']) { | 75 } else if (!params['noChange']) { |
| 76 request = new Request(request, init); | 76 request = new Request(request, init); |
| 77 } | 77 } |
| 78 var response; | |
| 78 fetch(request) | 79 fetch(request) |
| 79 .then(function(res) { | 80 .then(function(res) { |
| 80 // Send the result to fetch-access-control.html. | 81 response = res; |
| 81 port.postMessage({fetchResult: 'resolved', | 82 return res.text(); |
| 82 hasBody: !!res.body, | 83 }, function(e) { |
| 83 headers: headersToArray(res.headers), | |
| 84 type: res.type, | |
| 85 originalURL: originalURL}); | |
| 86 resolve(res); | |
| 87 }) | |
| 88 .catch(function(e) { | |
| 89 // Send the result to fetch-access-control.html. | 84 // Send the result to fetch-access-control.html. |
|
yhirano
2014/09/09 09:31:48
This handler "catch"es an error, i.e. port.postMes
horo
2014/09/10 06:18:44
I was wrong.
Fixed.
| |
| 90 port.postMessage({fetchResult: 'rejected'}); | 85 port.postMessage({fetchResult: 'rejected'}); |
| 91 reject(); | 86 reject(); |
| 92 }); | 87 }) |
| 88 .then(function(body) { | |
| 89 // Send the result to fetch-access-control.html. | |
| 90 port.postMessage({fetchResult: 'resolved', | |
| 91 body: body, | |
| 92 headers: headersToArray(response.headers), | |
| 93 type: response.type, | |
| 94 originalURL: originalURL}); | |
| 95 resolve(response); | |
| 96 }) | |
| 93 } catch (e) { | 97 } catch (e) { |
| 94 // Send the result to fetch-access-control.html. | 98 // Send the result to fetch-access-control.html. |
| 95 port.postMessage({fetchResult: 'error'}); | 99 port.postMessage({fetchResult: 'error'}); |
| 96 reject(); | 100 reject(); |
| 97 } | 101 } |
| 98 })); | 102 })); |
| 99 }); | 103 }); |
| OLD | NEW |